From patchwork Wed Feb 17 18:38:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 80005 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1HIcYaB012053 for ; Wed, 17 Feb 2010 18:38:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753461Ab0BQSia (ORCPT ); Wed, 17 Feb 2010 13:38:30 -0500 Received: from mail-fx0-f215.google.com ([209.85.220.215]:39631 "EHLO mail-fx0-f215.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750883Ab0BQSi3 (ORCPT ); Wed, 17 Feb 2010 13:38:29 -0500 Received: by fxm7 with SMTP id 7so9078530fxm.28 for ; Wed, 17 Feb 2010 10:38:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=qXCqlE7Ddc9GNU04CRqvA9Z0JhWbCDNRh5rwKXW9DRg=; b=FoFmoT3r+UpdZKyoeCGMYW2rXh1+frIBLJiMNTQH62RQibuZbhfYEGeAEMVhs5phYI 8zWMT0wNFsM4phdq6wAb+A97oCiR3kcypuFbWW9bCrZKdMbkdLrzj/And26vI9uKXWXr 1LmndBCCK5FD0pQ82FPK6j4vtCaWJOcKxPQUk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=nmCtUH9282cH4XTPqYHKHPND/wOW3nHKObARb4tiP0sA/Z7rOrWMmOHpfUIcjjXRPt 1KqUBC77cc5o+FVk5No29ipzJ29yQY2n80FsZhRMBCnPvYC5Xs4w/DODl/kExIp9Hp3d SxM7Ej/9wmw6prXYBYSzehqbK7s6RzbViNsok= Received: by 10.87.42.33 with SMTP id u33mr4963470fgj.8.1266431907957; Wed, 17 Feb 2010 10:38:27 -0800 (PST) Received: from localhost.localdomain (swsoft-msk-nat.sw.ru [195.214.232.10]) by mx.google.com with ESMTPS id 12sm15526889fgg.12.2010.02.17.10.38.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 17 Feb 2010 10:38:27 -0800 (PST) From: Dmitry Monakhov To: linux-fsdevel@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Dmitry Monakhov Subject: [PATCH 04/19] btrfs: replace inode uid, gid, mode initialization with helper function Date: Wed, 17 Feb 2010 21:38:24 +0300 Message-Id: <1266431904-9060-1-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1266431353-8549-1-git-send-email-dmonakhov@openvz.org> References: <1266431353-8549-1-git-send-email-dmonakhov@openvz.org> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 17 Feb 2010 18:38:35 +0000 (UTC) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4deb280..ae4f64c 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;