Merge tag 'nfsd-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

[linux-2.6-microblaze.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 7411658..aa353fd 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -809,10 +809,6 @@ int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
        if (fl->fl_flags & FL_RECLAIM)
                return -ENOGRACE;
 
-       /* No mandatory locks over NFS */
-       if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
-               goto out_err;
-
        if (NFS_SERVER(inode)->flags & NFS_MOUNT_LOCAL_FCNTL)
                is_local = 1;