These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / lockd / clntproc.c

diff --git a/kernel/fs/lockd/clntproc.c b/kernel/fs/lockd/clntproc.c
index acd3947..1129520 100644 (file)
--- a/kernel/fs/lockd/clntproc.c
+++ b/kernel/fs/lockd/clntproc.c
@@ -474,18 +474,7 @@ static void nlmclnt_locks_init_private(struct file_lock *fl, struct nlm_host *ho
 
 static int do_vfs_lock(struct file_lock *fl)
 {
-       int res = 0;
-       switch (fl->fl_flags & (FL_POSIX|FL_FLOCK)) {
-               case FL_POSIX:
-                       res = posix_lock_file_wait(fl->fl_file, fl);
-                       break;
-               case FL_FLOCK:
-                       res = flock_lock_file_wait(fl->fl_file, fl);
-                       break;
-               default:
-                       BUG();
-       }
-       return res;
+       return locks_lock_file_wait(fl->fl_file, fl);
 }
 
 /*