This patchset fixes the problems that Trond pointed out last week, namely that you can end up deadlocking yourself if you set a file-private lock on a file and then do some I/O on the same. With this set, mandatory locking should work more or less as you'd expect with file-private locks. If you set a lock on an open file and then do some I/O on it, it won't block. If you try to lock and do I/O on different open files, then the I/O may end up blocked. Note that this approach is just as racy as the existing mandatory lock implementation, but I don't think it makes anything worse there. Jeff Layton (2): locks: fix locks_mandatory_locked to respect file-private locks locks: make locks_mandatory_area check for file-private locks fs/locks.c | 22 +++++++++++++++++----- fs/namei.c | 2 +- include/linux/fs.h | 20 ++++++++++---------- mm/mmap.c | 2 +- mm/nommu.c | 2 +- 5 files changed, 30 insertions(+), 18 deletions(-) -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html