diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-09-19 17:38:55 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-09-19 17:38:55 +0800 |
commit | 7ddc655ad909372848a3e7995e222c2b9224c2e0 (patch) | |
tree | a68d86598e6527e24197c0d43169807eb3a7f081 /fs/nfs | |
parent | 266fa7380746e8d998691be98b311dc426e4c4ce (diff) | |
parent | 04cb720142764ebf3786eba1feb8fc4b6ef87fcf (diff) |
Merge tag 'v4.1.33' into linux-linaro-lsk-v4.1lsk-v4.1-16.09
This is the 4.1.33 stable release
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/callback.c | 1 | ||||
-rw-r--r-- | fs/nfs/pnfs.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 8d129bb7355a..a78558a25035 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -303,6 +303,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n err_socks: svc_rpcb_cleanup(serv, net); err_bind: + nn->cb_users[minorversion]--; dprintk("NFS: Couldn't create callback socket: err = %d; " "net = %p\n", ret, net); return ret; diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index d47c188682b1..ea4fe630cdac 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1472,6 +1472,7 @@ pnfs_update_layout(struct inode *ino, goto out; lookup_again: + nfs4_client_recover_expired_lease(clp); first = false; spin_lock(&ino->i_lock); lo = pnfs_find_alloc_layout(ino, ctx, gfp_flags); |