diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 09:56:43 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 09:56:43 +0200 |
commit | 301a36fa700f9add6e14f5a95c7573e01578343a (patch) | |
tree | 6ff94ff3b08b838353b9127eb5f8055b3de6b25f /fs/nfs/nfs4client.c | |
parent | ARM: 8611/1: l2x0: add PMU support (diff) | |
parent | ARM: sa1111: provide to_sa1111_device() macro (diff) | |
download | linux-301a36fa700f9add6e14f5a95c7573e01578343a.tar.xz linux-301a36fa700f9add6e14f5a95c7573e01578343a.zip |
Merge branches 'misc' and 'sa1111-base' into for-linus
Diffstat (limited to 'fs/nfs/nfs4client.c')
-rw-r--r-- | fs/nfs/nfs4client.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 8d7d08d4f95f..cd3b7cfdde16 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -817,6 +817,11 @@ static int nfs4_set_client(struct nfs_server *server, goto error; } + if (server->nfs_client == clp) { + error = -ELOOP; + goto error; + } + /* * Query for the lease time on clientid setup or renewal * |