From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Hansen Subject: [RFC][PATCH 11/27] sys_symlinkat() collapse one more if () Date: Wed, 07 Jun 2006 17:10:23 -0700 Message-ID: <20060608001023.6189AD37@localhost.localdomain> References: <20060608001013.0D041507@localhost.localdomain> Cc: herbert@13thfloor.at, viro@ftp.linux.org.uk, hch@infradead.org, trond.myklebust@fys.uio.no, Dave Hansen Return-path: Received: from e5.ny.us.ibm.com ([32.97.182.145]:42714 "EHLO e5.ny.us.ibm.com") by vger.kernel.org with ESMTP id S932481AbWFHAKe (ORCPT ); Wed, 7 Jun 2006 20:10:34 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e5.ny.us.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id k580ATZl013652 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Jun 2006 20:10:30 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay02.pok.ibm.com (8.13.6/NCO/VER7.0) with ESMTP id k580ARJh252052 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 7 Jun 2006 20:10:27 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id k580AQpB004952 for ; Wed, 7 Jun 2006 20:10:27 -0400 To: linux-fsdevel@vger.kernel.org In-Reply-To: <20060608001013.0D041507@localhost.localdomain> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Collapse another if() to make way for a new condition. This patch should make no functional changes. Signed-off-by: Dave Hansen --- lxc-dave/fs/namei.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff -puN fs/namei.c~elevate-writers-vfs_symlink-part2 fs/namei.c --- lxc/fs/namei.c~elevate-writers-vfs_symlink-part2 2006-06-07 16:53:18.000000000 -0700 +++ lxc-dave/fs/namei.c 2006-06-07 16:53:18.000000000 -0700 @@ -2186,10 +2186,12 @@ asmlinkage long sys_symlinkat(const char goto out; dentry = lookup_create(&nd, 0); error = PTR_ERR(dentry); - if (!IS_ERR(dentry)) { - error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); - dput(dentry); - } + if (IS_ERR(dentry)) + goto out_unlock; + + error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); + dput(dentry); +out_unlock: mutex_unlock(&nd.dentry->d_inode->i_mutex); path_release(&nd); out: _