X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=fs%2Fnfs%2Fnfs4proc.c;h=ff5bddc49a2a30449a63a6c2a32a2aadc6db84b5;hb=e6604ecb70d4b1dbc0372c6518b51c25c4b135a1;hp=7ed8f2cd97f8711ce86817f7449c97acb7ff6a27;hpb=941c3ff3102ccce440034d59cf9e4e9cc10b720d;p=cascardo%2Flinux.git

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 7ed8f2cd97f8..ff5bddc49a2a 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5512,18 +5512,7 @@ static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *
 
 static int do_vfs_lock(struct inode *inode, struct file_lock *fl)
 {
-	int res = 0;
-	switch (fl->fl_flags & (FL_POSIX|FL_FLOCK)) {
-		case FL_POSIX:
-			res = posix_lock_inode_wait(inode, fl);
-			break;
-		case FL_FLOCK:
-			res = flock_lock_inode_wait(inode, fl);
-			break;
-		default:
-			BUG();
-	}
-	return res;
+	return locks_lock_inode_wait(inode, fl);
 }
 
 struct nfs4_unlockdata {