VFS: Add support for the FL_ACCESS flag to flock_lock_file() From: Trond Myklebust Signed-off-by: Trond Myklebust --- fs/locks.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index 72f9f63..64b96b1 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -741,6 +741,8 @@ static int flock_lock_file(struct file * int found = 0; lock_kernel(); + if (request->fl_flags & FL_ACCESS) + goto find_conflict; for_each_lock(inode, before) { struct file_lock *fl = *before; if (IS_POSIX(fl)) @@ -772,6 +774,7 @@ static int flock_lock_file(struct file * if (found) cond_resched(); +find_conflict: for_each_lock(inode, before) { struct file_lock *fl = *before; if (IS_POSIX(fl)) @@ -785,6 +788,8 @@ static int flock_lock_file(struct file * locks_insert_block(fl, request); goto out; } + if (request->fl_flags & FL_ACCESS) + goto out; locks_copy_lock(new_fl, request); locks_insert_lock(&inode->i_flock, new_fl); new_fl = NULL;