diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-04-23 15:16:27 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-04-23 15:16:27 -0400 |
| commit | 21330b667070fd64b2340d8d31c1b0800df78ec8 (patch) | |
| tree | 9f13170097e7041603881d18b4a6000535a8c6fc /fs/nfs/delegation.c | |
| parent | c7757074839f2cd440521482d76ea180d0d4bdac (diff) | |
| parent | 5fcdfacc01f3a3415b75acb172cd75c9fe1cbda5 (diff) | |
| download | linux-21330b667070fd64b2340d8d31c1b0800df78ec8.tar.bz2 | |
Merge branch 'bugfixes'
* bugfixes:
NFSv4: Return delegations synchronously in evict_inode
SUNRPC: Fix a regression when reconnecting
NFS: remount with security change should return EINVAL
nfs: do not export discarded symbols
NFSv4.1: don't export static symbol
Diffstat (limited to 'fs/nfs/delegation.c')
| -rw-r--r-- | fs/nfs/delegation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 540ee260318c..029d688a969f 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -514,7 +514,7 @@ void nfs_inode_return_delegation_noreclaim(struct inode *inode) delegation = nfs_inode_detach_delegation(inode); if (delegation != NULL) - nfs_do_return_delegation(inode, delegation, 0); + nfs_do_return_delegation(inode, delegation, 1); } /** |