diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /fs/nfs/nfs4proc.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index a036e93bdf96..1949bbd806eb 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -4237,12 +4237,9 @@ static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, str | |||
| 4237 | err = _nfs4_do_fsinfo(server, fhandle, fsinfo); | 4237 | err = _nfs4_do_fsinfo(server, fhandle, fsinfo); |
| 4238 | trace_nfs4_fsinfo(server, fhandle, fsinfo->fattr, err); | 4238 | trace_nfs4_fsinfo(server, fhandle, fsinfo->fattr, err); |
| 4239 | if (err == 0) { | 4239 | if (err == 0) { |
| 4240 | struct nfs_client *clp = server->nfs_client; | 4240 | nfs4_set_lease_period(server->nfs_client, |
| 4241 | 4241 | fsinfo->lease_time * HZ, | |
| 4242 | spin_lock(&clp->cl_lock); | 4242 | now); |
| 4243 | clp->cl_lease_time = fsinfo->lease_time * HZ; | ||
| 4244 | clp->cl_last_renewal = now; | ||
| 4245 | spin_unlock(&clp->cl_lock); | ||
| 4246 | break; | 4243 | break; |
| 4247 | } | 4244 | } |
| 4248 | err = nfs4_handle_exception(server, err, &exception); | 4245 | err = nfs4_handle_exception(server, err, &exception); |