Merge branch 'akpm-current/current'

[karo-tx-linux.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 17d3417c8a74375a2974af6e1c4f13219b188476..93e236429c5d785a1711d643d0b4676dfe4396cf 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -738,18 +738,7 @@ out_noconflict:
 
 static int do_vfs_lock(struct file *file, struct file_lock *fl)
 {
-       int res = 0;
-       switch (fl->fl_flags & (FL_POSIX|FL_FLOCK)) {
-               case FL_POSIX:
-                       res = posix_lock_file_wait(file, fl);
-                       break;
-               case FL_FLOCK:
-                       res = flock_lock_file_wait(file, fl);
-                       break;
-               default:
-                       BUG();
-       }
-       return res;
+       return locks_lock_file_wait(file, fl);
 }
 
 static int