From patchwork Wed Feb 17 18:46:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 45652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 81BEEB7080 for ; Thu, 18 Feb 2010 05:48:48 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1Nhouv-00049i-SX; Wed, 17 Feb 2010 18:46:33 +0000 Received: from mail-fx0-f209.google.com ([209.85.220.209]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1Nhouo-00049P-9s for linux-mtd@lists.infradead.org; Wed, 17 Feb 2010 18:46:30 +0000 Received: by fxm1 with SMTP id 1so8153427fxm.4 for ; Wed, 17 Feb 2010 10:46:25 -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=ixev7ajQzeLNaZKRuccUUsjcbwUSxfUxORn3RDlXqUw=; b=ZBKWGADH7cpydwcw+OKUiWYuOR5zE7kwhNzNEAgg0sXO3e+p2IbfRwapfQsXQf+2IK t8pqTJKvgE059SCdQuJNclY0H3aBmdgRmBXtXiJyclbQhD62lMcpIUtxuax7RRev+/60 G1tif+GHU5LqqstL2rS8WJGQAlirjdkE/6B8Y= 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=gcF9uELJ/sNyU7hCqSiTthu017uq9+g/83vYIK5rFG4WWIba3jDBgaVi2dmsk8c2N/ xDSJFii8OXSbYQZMlBRvvzoUEqGuVbaKApBHwFu4rSImQMAxeD7zTmaMRiqlaXdGak0F CGaBTn0yBXWNPqgQgdAdTYFsy3CkAulpYIGr0= Received: by 10.87.56.7 with SMTP id i7mr15002683fgk.25.1266432384582; Wed, 17 Feb 2010 10:46:24 -0800 (PST) Received: from localhost.localdomain (swsoft-msk-nat.sw.ru [195.214.232.10]) by mx.google.com with ESMTPS id d6sm9303458fga.24.2010.02.17.10.46.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 17 Feb 2010 10:46:23 -0800 (PST) From: Dmitry Monakhov To: linux-fsdevel@vger.kernel.org Subject: [PATCH 17/19] ubifs: replace inode uid, gid, mode initialization with helper function Date: Wed, 17 Feb 2010 21:46:20 +0300 Message-Id: <1266432380-9951-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> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100217_134626_490749_02BE9CFE X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- _SUMMARY_ Cc: Dmitry Monakhov , linux-mtd@lists.infradead.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Dmitry Monakhov Acked-by: Artem Bityutskiy --- fs/ubifs/dir.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 552fb01..5a357bf 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -104,14 +104,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, */ inode->i_flags |= (S_NOCMTIME); - 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); inode->i_mtime = inode->i_atime = inode->i_ctime = ubifs_current_time(inode); inode->i_mapping->nrpages = 0;