|
@@ -87,6 +87,12 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl)
|
|
u8 wait = 0;
|
|
u8 wait = 0;
|
|
u16 op = CEPH_MDS_OP_SETFILELOCK;
|
|
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));
|
|
fl->fl_nspid = get_pid(task_tgid(current));
|
|
dout("ceph_lock, fl_pid:%d", fl->fl_pid);
|
|
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;
|
|
int err;
|
|
u8 wait = 0;
|
|
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));
|
|
fl->fl_nspid = get_pid(task_tgid(current));
|
|
dout("ceph_flock, fl_pid:%d", fl->fl_pid);
|
|
dout("ceph_flock, fl_pid:%d", fl->fl_pid);
|
|
|
|
|