ceph: fix mandatory flock check

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

ceph: fix mandatory flock check
Signed-off-by: Yan, Zheng <zyan@redhat.com>
db4a63aa · Yan, Zheng · Ilya Dryomov · e55f1a18 · db4a63aa
Commit db4a63aa authored Sep 13, 2016 by Yan, Zheng Committed by Ilya Dryomov Oct 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

fs/ceph/locks.c fs/ceph/locks.c +2 -2

No files found.
--- 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)
+	if (fl->fl_type & LOCK_MAND)
-		return -ENOLCK;
+		return -EOPNOTSUPP;
 	dout("ceph_flock, fl_file: %p", fl->fl_file);