projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fs: remove mandatory file locking support
[linux-2.6-microblaze.git]
/
fs
/
ceph
/
locks.c
diff --git
a/fs/ceph/locks.c
b/fs/ceph/locks.c
index
fa8a847
..
bdeb271
100644
(file)
--- a/
fs/ceph/locks.c
+++ b/
fs/ceph/locks.c
@@
-240,9
+240,6
@@
int ceph_lock(struct file *file, int cmd, struct file_lock *fl)
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;
dout("ceph_lock, fl_owner: %p\n", fl->fl_owner);