projects/linux·commit 2e2f756f

locks: fix list insertion when lock is split in two

2e2f756f · Jeff Layton <[email protected]> · 2015-02-17 17:08:23 -05:00

In the case where we're splitting a lock in two, the current code
the new "left" lock in the incorrect spot. It's inserted just
before "right" when it should instead be inserted just before the
new lock.

When we add a new lock, set "fl" to that value so that we can
add "left" before it.

Reported-by: Al Viro <[email protected]>
Signed-off-by: Jeff Layton <[email protected]>
Commit
2e2f756f81edd7c3ba6ed384385ae1d6491652eb
Parents
267f1128

Changes

1 files changed · +1 −0

FileStatusAddDelContent
fs/locks.cmodified+1−0View file

fs/locks.c

View file
diff --git a/fs/locks.c b/fs/locks.c
index 90b652a..365c82e 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1107,6 +1107,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
}
locks_copy_lock(new_fl, request);
locks_insert_lock_ctx(new_fl, &fl->fl_list);
+ fl = new_fl;
new_fl = NULL;
}
if (right) {