From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Monakhov Subject: [PATCH 04/19] btrfs: replace inode uid,gid,mode initialization with helper function Date: Thu, 4 Mar 2010 17:31:47 +0300 Message-ID: <1267713111-9228-2-git-send-email-dmonakhov@openvz.org> References: <1267712897-9088-1-git-send-email-dmonakhov@openvz.org> Cc: Dmitry Monakhov To: linux-fsdevel@vger.kernel.org Return-path: Received: from mail-bw0-f209.google.com ([209.85.218.209]:58394 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753153Ab0CDOb7 (ORCPT ); Thu, 4 Mar 2010 09:31:59 -0500 Received: by bwz1 with SMTP id 1so417045bwz.21 for ; Thu, 04 Mar 2010 06:31:58 -0800 (PST) In-Reply-To: <1267712897-9088-1-git-send-email-dmonakhov@openvz.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Signed-off-by: Dmitry Monakhov --- fs/btrfs/inode.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index c41db6d..a54561f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4145,16 +4145,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, if (ret != 0) goto fail; - inode->i_uid = current_fsuid(); - - if (dir && (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); inode->i_ino = objectid; inode_set_bytes(inode, 0); inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; -- 1.6.6