diff options
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index b96714ae3dd7..3647c942915e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -1295,7 +1295,7 @@ nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type) | |||
| 1295 | fp = find_file(ino); | 1295 | fp = find_file(ino); |
| 1296 | if (!fp) | 1296 | if (!fp) |
| 1297 | return nfs_ok; | 1297 | return nfs_ok; |
| 1298 | ret = nfserr_share_denied; | 1298 | ret = nfserr_locked; |
| 1299 | /* Search for conflicting share reservations */ | 1299 | /* Search for conflicting share reservations */ |
| 1300 | list_for_each_entry(stp, &fp->fi_stateids, st_perfile) { | 1300 | list_for_each_entry(stp, &fp->fi_stateids, st_perfile) { |
| 1301 | if (test_bit(deny_type, &stp->st_deny_bmap) || | 1301 | if (test_bit(deny_type, &stp->st_deny_bmap) || |