diff options
-rw-r--r-- | fs/nfs/file.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 1557978ca7b3..b039a17ee941 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -834,6 +834,15 @@ int nfs_flock(struct file *filp, int cmd, struct file_lock *fl) | |||
834 | if (!(fl->fl_flags & FL_FLOCK)) | 834 | if (!(fl->fl_flags & FL_FLOCK)) |
835 | return -ENOLCK; | 835 | return -ENOLCK; |
836 | 836 | ||
837 | /* | ||
838 | * The NFSv4 protocol doesn't support LOCK_MAND, which is not part of | ||
839 | * any standard. In principle we might be able to support LOCK_MAND | ||
840 | * on NFSv2/3 since NLMv3/4 support DOS share modes, but for now the | ||
841 | * NFS code is not set up for it. | ||
842 | */ | ||
843 | if (fl->fl_type & LOCK_MAND) | ||
844 | return -EINVAL; | ||
845 | |||
837 | if (NFS_SERVER(inode)->flags & NFS_MOUNT_LOCAL_FLOCK) | 846 | if (NFS_SERVER(inode)->flags & NFS_MOUNT_LOCAL_FLOCK) |
838 | is_local = 1; | 847 | is_local = 1; |
839 | 848 | ||