diff options
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1eb694e0f305..535011a27415 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -5523,12 +5523,6 @@ static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request | |||
5523 | return err; | 5523 | return err; |
5524 | } | 5524 | } |
5525 | 5525 | ||
5526 | bool recover_locks = true; | ||
5527 | module_param(recover_locks, bool, 0644); | ||
5528 | MODULE_PARM_DESC(recover_locks, | ||
5529 | "If the server reports that a lock might be lost, " | ||
5530 | "try to recovery it risking corruption."); | ||
5531 | |||
5532 | static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) | 5526 | static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) |
5533 | { | 5527 | { |
5534 | struct nfs_server *server = NFS_SERVER(state->inode); | 5528 | struct nfs_server *server = NFS_SERVER(state->inode); |
@@ -5540,7 +5534,7 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request | |||
5540 | err = nfs4_set_lock_state(state, request); | 5534 | err = nfs4_set_lock_state(state, request); |
5541 | if (err != 0) | 5535 | if (err != 0) |
5542 | return err; | 5536 | return err; |
5543 | if (!recover_locks) { | 5537 | if (!recover_lost_locks) { |
5544 | set_bit(NFS_LOCK_LOST, &request->fl_u.nfs4_fl.owner->ls_flags); | 5538 | set_bit(NFS_LOCK_LOST, &request->fl_u.nfs4_fl.owner->ls_flags); |
5545 | return 0; | 5539 | return 0; |
5546 | } | 5540 | } |