Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-block.git] / fs / gfs2 / inode.c

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 68376fa038807e7d4a5ccc4d673148e1c53876d3..c9775d5c659497a0209dbc621faf2ce5bc901201 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -491,8 +491,8 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_inode *ip,
        di = (struct gfs2_dinode *)dibh->b_data;
        gfs2_dinode_out(ip, di);
 
-       di->di_major = cpu_to_be32(MAJOR(ip->i_inode.i_rdev));
-       di->di_minor = cpu_to_be32(MINOR(ip->i_inode.i_rdev));
+       di->di_major = cpu_to_be32(imajor(&ip->i_inode));
+       di->di_minor = cpu_to_be32(iminor(&ip->i_inode));
        di->__pad1 = 0;
        di->__pad2 = 0;
        di->__pad3 = 0;