From patchwork Tue Oct 15 20:39:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Fields X-Patchwork-Id: 3048171 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B501B9F2B6 for ; Tue, 15 Oct 2013 20:40:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B85782041E for ; Tue, 15 Oct 2013 20:40:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EC8120425 for ; Tue, 15 Oct 2013 20:40:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933999Ab3JOUkO (ORCPT ); Tue, 15 Oct 2013 16:40:14 -0400 Received: from fieldses.org ([174.143.236.118]:51257 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933957Ab3JOUkA (ORCPT ); Tue, 15 Oct 2013 16:40:00 -0400 Received: from bfields by fieldses.org with local (Exim 4.76) (envelope-from ) id 1VWBOx-0002w4-TD; Tue, 15 Oct 2013 16:39:35 -0400 From: "J. Bruce Fields" To: linux-fsdevel@vger.kernel.org Cc: Christoph Hellwig , Al Viro , linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 4/5] exportfs: slight reorganization of reconnect loop Date: Tue, 15 Oct 2013 16:39:32 -0400 Message-Id: <1381869574-10662-5-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1381869574-10662-1-git-send-email-bfields@redhat.com> References: <1381869574-10662-1-git-send-email-bfields@redhat.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "J. Bruce Fields" Just cleanup, no change in functionality Signed-off-by: J. Bruce Fields --- fs/exportfs/expfs.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index 24fb763..afa7c9c 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c @@ -208,19 +208,23 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir, char *nbuf) /* must have found a connected parent - great */ clear_disconnected(target_dir); noprogress = 0; - } else if (dentry == mnt->mnt_sb->s_root) { + dput(dentry); + continue; + } + if (dentry == mnt->mnt_sb->s_root) { printk(KERN_ERR "export: Eeek filesystem root is not connected, impossible\n"); clear_disconnected(target_dir); noprogress = 0; - } else { - /* - * We have hit the top of a disconnected path, try to - * find parent and connect. - */ - err = reconnect_one(mnt, dentry, nbuf, &noprogress); - if (err) - return err; + dput(dentry); + continue; } + /* + * We have hit the top of a disconnected path, try to + * find parent and connect. + */ + err = reconnect_one(mnt, dentry, nbuf, &noprogress); + if (err) + return err; dput(dentry); }