aboutsummaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/locks.c')
-rw-r--r--fs/locks.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 4c73b857dded..4a8072736efa 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -659,7 +659,7 @@ static int locks_block_on_timeout(struct file_lock *blocker, struct file_lock *w
659 return result; 659 return result;
660} 660}
661 661
662int 662void
663posix_test_lock(struct file *filp, struct file_lock *fl) 663posix_test_lock(struct file *filp, struct file_lock *fl)
664{ 664{
665 struct file_lock *cfl; 665 struct file_lock *cfl;
@@ -671,14 +671,12 @@ posix_test_lock(struct file *filp, struct file_lock *fl)
671 if (posix_locks_conflict(cfl, fl)) 671 if (posix_locks_conflict(cfl, fl))
672 break; 672 break;
673 } 673 }
674 if (cfl) { 674 if (cfl)
675 __locks_copy_lock(fl, cfl); 675 __locks_copy_lock(fl, cfl);
676 unlock_kernel(); 676 else
677 return 1;
678 } else
679 fl->fl_type = F_UNLCK; 677 fl->fl_type = F_UNLCK;
680 unlock_kernel(); 678 unlock_kernel();
681 return 0; 679 return;
682} 680}
683 681
684EXPORT_SYMBOL(posix_test_lock); 682EXPORT_SYMBOL(posix_test_lock);