aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/svclock.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index e42f0cc6c450..5fb48b4390bd 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -240,11 +240,6 @@ nlmsvc_delete_block(struct nlm_block *block, int unlock)
240 nlmsvc_remove_block(block); 240 nlmsvc_remove_block(block);
241 if (fl->fl_next) 241 if (fl->fl_next)
242 posix_unblock_lock(file->f_file, fl); 242 posix_unblock_lock(file->f_file, fl);
243 if (unlock) {
244 fl->fl_type = F_UNLCK;
245 posix_lock_file(file->f_file, fl);
246 block->b_granted = 0;
247 }
248 243
249 /* If the block is in the middle of a GRANT callback, 244 /* If the block is in the middle of a GRANT callback,
250 * don't kill it yet. */ 245 * don't kill it yet. */