'result' is not updated if a match isn't found in the nfs4_discover_server_trunking path. Signed-off-by: Weston Andros Adamson <dros@xxxxxxxxxxxxxxx> --- 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. -- 1.8.3.4 (Apple Git-47) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
