[PATCH 2/2] ceph: forbid mandatory file lock

[Yan, Zheng]

Signed-off-by: Yan, Zheng <zheng.z....@intel.com>
---
 fs/ceph/locks.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c
index 133e006..f91a569a 100644
--- a/fs/ceph/locks.c
+++ b/fs/ceph/locks.c
@@ -87,6 +87,12 @@ int ceph_lock(struct file *file, int cmd, struct file_lock 
*fl)
        u8 wait = 0;
        u16 op = CEPH_MDS_OP_SETFILELOCK;
 
+       if (!(fl->fl_flags & FL_POSIX))
+               return -ENOLCK;
+       /* No mandatory locks */
+       if (__mandatory_lock(file->f_mapping->host) && fl->fl_type != F_UNLCK)
+               return -ENOLCK;
+
        fl->fl_nspid = get_pid(task_tgid(current));
        dout("ceph_lock, fl_pid:%d", fl->fl_pid);
 
@@ -133,6 +139,12 @@ int ceph_flock(struct file *file, int cmd, struct 
file_lock *fl)
        int err;
        u8 wait = 0;
 
+       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;
+
        fl->fl_nspid = get_pid(task_tgid(current));
        dout("ceph_flock, fl_pid:%d", fl->fl_pid);
 
-- 
1.8.5.3

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html