From patchwork Mon Jan 20 03:45:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 3510561 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 106C7C02DC for ; Mon, 20 Jan 2014 03:46:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD41020148 for ; Mon, 20 Jan 2014 03:45:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2CBD2013D for ; Mon, 20 Jan 2014 03:45:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752217AbaATDpv (ORCPT ); Sun, 19 Jan 2014 22:45:51 -0500 Received: from mail-ie0-f170.google.com ([209.85.223.170]:56686 "EHLO mail-ie0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752553AbaATDpu (ORCPT ); Sun, 19 Jan 2014 22:45:50 -0500 Received: by mail-ie0-f170.google.com with SMTP id u16so5982072iet.1 for ; Sun, 19 Jan 2014 19:45:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jSjXeV2SXuGLaSZrfSiqkwJSb/THzlNY1TWUInJhP2k=; b=Gs/iS8IudGkC0CS+JYHzGKaDLQl4BAmvHa/IcCn5fwoVtxv4ePWx9DUk28PkbWWMaB dCRrv/vvIFxFn4Z4OwnhL3oShacvjdrbAee8JHQ3qupFfVD+G/yWShTCciekgP42aHtu LHGV4Xcmv8CGZoGoA4NWQhsbzov+rTBXqfTBhIHxg+rMhuQ8+Jpomh6IU/fSByloTRi6 N4lvJP3GdduLYj9zHwpMx9zoJljpqKiI2sUbeFzBSKaHMT5MyN7osOYuyy+baAb5n8VV S5XGohDTi9SDZXF6wJYMUzAX+k5cDagIuEwO82ODDgWm+FCaZRkhTTsNX70cz7RUqBGJ 8x5Q== X-Gm-Message-State: ALoCoQmFAam78vOxCXMNBr54VKeNqgmwJUkDmAXRfVVmJsRO96wcFyxdvevikBtzhc4m35LkWajX X-Received: by 10.50.43.233 with SMTP id z9mr10141743igl.33.1390189550498; Sun, 19 Jan 2014 19:45:50 -0800 (PST) Received: from gavrio.gateway.2wire.net (99-82-247-89.lightspeed.livnmi.sbcglobal.net. [99.82.247.89]) by mx.google.com with ESMTPSA id s15sm4137789igr.8.2014.01.19.19.45.49 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 19 Jan 2014 19:45:50 -0800 (PST) From: Weston Andros Adamson To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 2/2] nfs4: fix comments in discover_server_trunking Date: Sun, 19 Jan 2014 22:45:37 -0500 Message-Id: <1390189537-9666-2-git-send-email-dros@primarydata.com> X-Mailer: git-send-email 1.8.3.4 (Apple Git-47) In-Reply-To: <1390189537-9666-1-git-send-email-dros@primarydata.com> References: <1390189537-9666-1-git-send-email-dros@primarydata.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 'result' is not updated if a match isn't found in the nfs4_discover_server_trunking path. Signed-off-by: Weston Andros Adamson --- fs/nfs/nfs4client.c | 4 ++-- fs/nfs/nfs4state.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 0f9b772..147a752 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -465,7 +465,7 @@ static void nfs4_swap_callback_idents(struct nfs_client *keep, * nfs40_walk_client_list - Find server that recognizes a client ID * * @new: nfs_client with client ID to test - * @result: OUT: found nfs_client, or new + * @result: OUT: found nfs_client * @cred: credential to use for trunking test * * Returns zero, a negative errno, or a negative NFS4ERR status. @@ -601,7 +601,7 @@ out_major_mismatch: * nfs41_walk_client_list - Find nfs_client that matches a client/server owner * * @new: nfs_client with client ID to test - * @result: OUT: found nfs_client, or new + * @result: OUT: found nfs_client * @cred: credential to use for trunking test * * Returns zero, a negative errno, or a negative NFS4ERR status. diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index e5be725..666512e 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -328,7 +328,7 @@ out: * nfs41_discover_server_trunking - Detect server IP address trunking (mv1) * * @clp: nfs_client under test - * @result: OUT: found nfs_client, or clp + * @result: OUT: found nfs_client * @cred: credential to use for trunking test * * Returns NFS4_OK, a negative errno, or a negative NFS4ERR status.