From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 13 Sep 2016 02:15:36 +0000 (+0800)
Subject: ceph: fix mandatory flock check
X-Git-Tag: v4.9-rc1~55^2~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=db4a63aab43b2040292b2023512864702b5f9799;p=linux-block.git

ceph: fix mandatory flock check

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c
index a2cb0c254060..6806dbeaee19 100644
--- a/fs/ceph/locks.c
+++ b/fs/ceph/locks.c
@@ -210,8 +210,8 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)
 	if (!(fl->fl_flags & FL_FLOCK))
 		return -ENOLCK;
 	/* No mandatory locks */
-	if (__mandatory_lock(file->f_mapping->host) && fl->fl_type != F_UNLCK)
-		return -ENOLCK;
+	if (fl->fl_type & LOCK_MAND)
+		return -EOPNOTSUPP;
 
 	dout("ceph_flock, fl_file: %p", fl->fl_file);