dlmfs: use inode_init_owner()
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 24 Jul 2011 17:43:19 +0000 (13:43 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 4 Jan 2012 03:55:01 +0000 (22:55 -0500)
don't open-code it...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/ocfs2/dlmfs/dlmfs.c

index ccb33289c29aa83cba80c784a4f153f197cfda41..9e1090b8dd3bed9191cb5f3e427b1656f5167220 100644 (file)
@@ -407,9 +407,7 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb)
                ip = DLMFS_I(inode);
 
                inode->i_ino = get_next_ino();
-               inode->i_mode = mode;
-               inode->i_uid = current_fsuid();
-               inode->i_gid = current_fsgid();
+               inode_init_owner(inode, NULL, mode);
                inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
                inc_nlink(inode);
@@ -433,9 +431,7 @@ static struct inode *dlmfs_get_inode(struct inode *parent,
                return NULL;
 
        inode->i_ino = get_next_ino();
-       inode->i_mode = mode;
-       inode->i_uid = current_fsuid();
-       inode->i_gid = current_fsgid();
+       inode_init_owner(inode, parent, mode);
        inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 
@@ -472,13 +468,6 @@ static struct inode *dlmfs_get_inode(struct inode *parent,
                inc_nlink(inode);
                break;
        }
-
-       if (parent->i_mode & S_ISGID) {
-               inode->i_gid = parent->i_gid;
-               if (S_ISDIR(mode))
-                       inode->i_mode |= S_ISGID;
-       }
-
        return inode;
 }