Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jfs: replace inode uid,gid,mode init with helper

Browse source 
Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Dmitry Monakhov 2010-03-04 17:30:58 +03:00 committed by Al Viro
parent 217f206d68
commit 319b2be49e
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/jfs/jfs_inode.c
View file

@ -98,14 +98,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
goto fail_unlock; goto fail_unlock;
} }
inode->i_uid = current_fsuid(); inode_init_owner(inode, parent, mode);
if (parent->i_mode & S_ISGID) {
inode->i_gid = parent->i_gid;
if (S_ISDIR(mode))
mode |= S_ISGID;
} else
inode->i_gid = current_fsgid();
/* /*
* New inodes need to save sane values on disk when * New inodes need to save sane values on disk when
* uid & gid mount options are used * uid & gid mount options are used
@ -121,7 +114,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
if (rc) if (rc)
goto fail_drop; goto fail_drop;
inode->i_mode = mode;
/* inherit flags from parent */ /* inherit flags from parent */
jfs_inode->mode2 = JFS_IP(parent)->mode2 & JFS_FL_INHERIT; jfs_inode->mode2 = JFS_IP(parent)->mode2 & JFS_FL_INHERIT;
@ -134,7 +126,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
if (S_ISLNK(mode)) if (S_ISLNK(mode))
jfs_inode->mode2 &= ~(JFS_IMMUTABLE_FL|JFS_APPEND_FL); jfs_inode->mode2 &= ~(JFS_IMMUTABLE_FL|JFS_APPEND_FL);
} }
jfs_inode->mode2 |= mode; jfs_inode->mode2 |= inode->i_mode;
inode->i_blocks = 0; inode->i_blocks = 0;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;