From patchwork Sat Mar 5 23:30:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 613061 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p25NVBLh008997 for ; Sat, 5 Mar 2011 23:31:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752526Ab1CEXbK (ORCPT ); Sat, 5 Mar 2011 18:31:10 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:18191 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752408Ab1CEXbJ (ORCPT ); Sat, 5 Mar 2011 18:31:09 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id CF7A09403D; Sun, 6 Mar 2011 00:30:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id C8BB79403B; Sun, 6 Mar 2011 00:30:35 +0100 (CET) Date: Sun, 6 Mar 2011 00:30:35 +0100 (CET) From: Jesper Juhl To: linux-nfs@vger.kernel.org cc: linux-kernel@vger.kernel.org, Neil Brown , "J. Bruce Fields" , Trond Myklebust Subject: [PATCH] NFSD, VFS: Remove dead code in nfsd_rename() Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 05 Mar 2011 23:31:11 +0000 (UTC) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index da1d970..9cc626b 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1749,8 +1749,6 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, if (host_err) goto out_drop_write; } - if (host_err) - goto out_drop_write; host_err = vfs_rename(fdir, odentry, tdir, ndentry); if (!host_err) { host_err = commit_metadata(tfhp);