locks: remove LOCK_MAND flock lock support

[sfrench/cifs-2.6.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index aa353fd5824041f59b158c87db13251aca5815e5..24e7dccce3559f9b7d399fecea8109d88d1e8e41 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -843,15 +843,6 @@ int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
        if (!(fl->fl_flags & FL_FLOCK))
                return -ENOLCK;
 
-       /*
-        * The NFSv4 protocol doesn't support LOCK_MAND, which is not part of
-        * any standard. In principle we might be able to support LOCK_MAND
-        * on NFSv2/3 since NLMv3/4 support DOS share modes, but for now the
-        * NFS code is not set up for it.
-        */
-       if (fl->fl_type & LOCK_MAND)
-               return -EINVAL;
-
        if (NFS_SERVER(inode)->flags & NFS_MOUNT_LOCAL_FLOCK)
                is_local = 1;