Acked-by: Dave Kleikamp <shaggy@xxxxxxxxxxxxxxxxxx>
One minor nit though. jfs maintains jfs_inode->mode2 which is a
superset of inode->i_mode. Since inode_init_owner() may set S_ISGID,
the following change should also be made. (I don't think these
duplicate bits in mode2 are really important, but we may as well be
consistent.)
diff -Nurp linux/fs/jfs/jfs_inode.c linux.new/fs/jfs/jfs_inode.c
--- linux/fs/jfs/jfs_inode.c 2010-02-17 15:46:31.000000000 -0600
+++ linux.new/fs/jfs/jfs_inode.c 2010-02-17 15:47:58.000000000 -0600
@@ -126,7 +126,7 @@ struct inode *ialloc(struct inode *paren
if (S_ISLNK(mode))
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_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
Thanks,
Shaggy
On Wed, 2010-02-17 at 21:41 +0300, Dmitry Monakhov wrote:
> Signed-off-by: Dmitry Monakhov <dmonakhov@xxxxxxxxxx>
> ---
> fs/jfs/jfs_inode.c | 10 +---------
> 1 files changed, 1 insertions(+), 9 deletions(-)
>
> diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
> index dc0e021..841a8d5 100644
> --- a/fs/jfs/jfs_inode.c
> +++ b/fs/jfs/jfs_inode.c
> @@ -98,14 +98,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
> goto fail_unlock;
> }
>
> - inode->i_uid = current_fsuid();
> - 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();
> -
> + inode_init_owner(inode, parent, mode);
> /*
> * New inodes need to save sane values on disk when
> * uid & gid mount options are used
> @@ -121,7 +114,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
> goto fail_drop;
> }
>
> - inode->i_mode = mode;
> /* inherit flags from parent */
> jfs_inode->mode2 = JFS_IP(parent)->mode2 & JFS_FL_INHERIT;
>
--
David Kleikamp
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
