From: Dmitry Monakhov <dmonakhov@openvz.org> To: linux-fsdevel@vger.kernel.org Cc: ocfs2-devel@oss.oracle.com, Dmitry Monakhov <dmonakhov@openvz.org> Subject: [PATCH 12/19] ocfs2: replace inode uid,gid,mode initialization with helper function Date: Wed, 17 Feb 2010 21:43:26 +0300 [thread overview] Message-ID: <1266432206-9512-1-git-send-email-dmonakhov@openvz.org> (raw) In-Reply-To: <1266431353-8549-1-git-send-email-dmonakhov@openvz.org> Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> --- fs/ocfs2/dlm/dlmfs.c | 11 +---------- fs/ocfs2/namei.c | 9 +-------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index 02bf178..248df45 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c @@ -364,9 +364,7 @@ static struct inode *dlmfs_get_inode(struct inode *parent, if (!inode) return NULL; - 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; @@ -403,13 +401,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; } diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 50fb26a..2877404 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -204,14 +204,7 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode) inode->i_nlink = 2; else inode->i_nlink = 1; - inode->i_uid = current_fsuid(); - if (dir->i_mode & S_ISGID) { - inode->i_gid = dir->i_gid; - if (S_ISDIR(mode)) - mode |= S_ISGID; - } else - inode->i_gid = current_fsgid(); - inode->i_mode = mode; + inode_init_owner(inode, dir, mode); vfs_dq_init(inode); return inode; } -- 1.6.6
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Monakhov <dmonakhov@openvz.org> To: linux-fsdevel@vger.kernel.org Cc: ocfs2-devel@oss.oracle.com, Dmitry Monakhov <dmonakhov@openvz.org> Subject: [Ocfs2-devel] [PATCH 12/19] ocfs2: replace inode uid, gid, mode initialization with helper function Date: Wed, 17 Feb 2010 21:43:26 +0300 [thread overview] Message-ID: <1266432206-9512-1-git-send-email-dmonakhov@openvz.org> (raw) In-Reply-To: <1266431353-8549-1-git-send-email-dmonakhov@openvz.org> Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> --- fs/ocfs2/dlm/dlmfs.c | 11 +---------- fs/ocfs2/namei.c | 9 +-------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index 02bf178..248df45 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c @@ -364,9 +364,7 @@ static struct inode *dlmfs_get_inode(struct inode *parent, if (!inode) return NULL; - 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; @@ -403,13 +401,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; } diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 50fb26a..2877404 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -204,14 +204,7 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode) inode->i_nlink = 2; else inode->i_nlink = 1; - inode->i_uid = current_fsuid(); - if (dir->i_mode & S_ISGID) { - inode->i_gid = dir->i_gid; - if (S_ISDIR(mode)) - mode |= S_ISGID; - } else - inode->i_gid = current_fsgid(); - inode->i_mode = mode; + inode_init_owner(inode, dir, mode); vfs_dq_init(inode); return inode; } -- 1.6.6
next prev parent reply other threads:[~2010-02-17 18:43 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-02-17 18:29 [PATCH 00/19] fs cleanup: remove duplicated code on inode init Dmitry Monakhov 2010-02-17 18:34 ` [PATCH 01/19] vfs: Add inode uid,gid,mode initialization with helper function Dmitry Monakhov 2010-02-17 23:03 ` James Morris 2010-02-18 6:57 ` [PATCH 01/19] vfs: Add inode uid,gid,mode init helper v2 Dmitry Monakhov 2010-02-17 18:36 ` [PATCH 02/19] 9p: replace inode uid,gid,mode initialization with helper function Dmitry Monakhov 2010-02-17 18:37 ` [PATCH 03/19] bfs: " Dmitry Monakhov 2010-02-17 18:38 ` [PATCH 04/19] btrfs: " Dmitry Monakhov 2010-02-17 18:39 ` [PATCH 05/19] exofs: " Dmitry Monakhov 2010-02-20 0:15 ` Boaz Harrosh 2010-02-17 18:40 ` [PATCH 06/19] ext2: " Dmitry Monakhov 2010-02-18 1:21 ` Jan Kara 2010-02-18 7:00 ` [PATCH 06/19] ext2: replace inode uid,gid,mode init with helper v2 Dmitry Monakhov 2010-02-18 18:49 ` Jan Kara 2010-02-17 18:40 ` [PATCH 07/19] ext3: replace inode uid,gid,mode initialization with helper function Dmitry Monakhov 2010-02-18 7:02 ` [PATCH 07/19] ext3: replace inode uid,gid,mode init with helper v2 Dmitry Monakhov 2010-02-17 18:40 ` [PATCH 08/19] ext4: replace inode uid,gid,mode initialization with helper function Dmitry Monakhov 2010-02-17 23:39 ` Andreas Dilger 2010-02-18 7:09 ` [PATCH 08/19] ext4: replace inode uid,gid,mode init with helper v2 Dmitry Monakhov 2010-02-18 20:52 ` [PATCH 08/19] ext4: replace inode uid,gid,mode initialization with helper function tytso 2010-02-19 10:30 ` Dmitry Monakhov 2010-02-19 14:39 ` [PATCH] ext4: deprecate obsoleted mount options Dmitry Monakhov 2010-02-23 0:28 ` Andreas Dilger 2010-02-23 19:23 ` [PATCH] ext4: deprecate obsoleted mount options v2 Dmitry Monakhov 2010-02-23 20:13 ` tytso 2010-02-24 18:12 ` [PATCH] ext4: deprecate obsoleted mount options v3 Dmitry Monakhov 2010-03-02 3:43 ` tytso 2010-02-17 18:41 ` [PATCH 09/19] jfs: replace inode uid,gid,mode initialization with helper function Dmitry Monakhov 2010-02-17 21:57 ` Dave Kleikamp 2010-02-18 7:12 ` [PATCH 09/19] jfs: replace inode uid,gid,mode init with helper v2 Dmitry Monakhov 2010-02-17 18:41 ` [PATCH 10/19] minix: replace inode uid,gid,mode initialization with helper function Dmitry Monakhov 2010-02-17 18:42 ` [PATCH 11/19] nilfs2: " Dmitry Monakhov 2010-02-18 1:28 ` Ryusuke Konishi 2010-02-17 18:43 ` Dmitry Monakhov [this message] 2010-02-17 18:43 ` [Ocfs2-devel] [PATCH 12/19] ocfs2: replace inode uid, gid, mode " Dmitry Monakhov 2010-02-18 4:07 ` [PATCH 12/19] ocfs2: replace inode uid,gid,mode " Joel Becker 2010-02-18 4:07 ` [Ocfs2-devel] [PATCH 12/19] ocfs2: replace inode uid, gid, mode " Joel Becker 2010-02-17 18:44 ` [PATCH 13/19] omfs: replace inode uid,gid,mode " Dmitry Monakhov 2010-02-17 18:44 ` [PATCH 14/19] ramfs: " Dmitry Monakhov 2010-02-17 18:45 ` [PATCH 15/19] reiserfs: " Dmitry Monakhov 2010-02-17 18:45 ` [PATCH 16/19] sysv: " Dmitry Monakhov 2010-02-17 18:46 ` [PATCH 17/19] ubifs: " Dmitry Monakhov 2010-02-17 18:46 ` [PATCH 17/19] ubifs: replace inode uid, gid, mode " Dmitry Monakhov 2010-02-18 10:54 ` [PATCH 17/19] ubifs: replace inode uid,gid,mode " Artem Bityutskiy 2010-02-18 10:54 ` Artem Bityutskiy 2010-02-17 18:47 ` [PATCH 18/19] udf: " Dmitry Monakhov 2010-02-17 23:43 ` Jan Kara 2010-02-18 7:18 ` [PATCH 18/19] udf: replace inode uid,gid,mode init with helper v2 Dmitry Monakhov 2010-02-18 18:53 ` Jan Kara 2010-02-18 19:55 ` [PATCH 18/19] udf: replace inode uid,gid,mode init with helper v3 Dmitry Monakhov 2010-02-19 10:56 ` Jan Kara 2010-02-17 18:47 ` [PATCH 19/19] ufs: replace inode uid,gid,mode initialization with helper function Dmitry Monakhov 2010-03-04 14:28 [PATCH 00/19] fs cleanup: remove duplicated code on inode init v2 Dmitry Monakhov 2010-03-04 14:32 ` [PATCH 12/19] ocfs2: replace inode uid,gid,mode initialization with helper function Dmitry Monakhov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1266432206-9512-1-git-send-email-dmonakhov@openvz.org \ --to=dmonakhov@openvz.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=ocfs2-devel@oss.oracle.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.