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
Merge tag 'clk-renesas-for-v5.1-tag2' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
f0b24d9
..
ff6af2c
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-453,7
+453,7
@@
static void locks_move_blocks(struct file_lock *new, struct file_lock *fl)
return;
spin_lock(&blocked_lock_lock);
list_splice_init(&fl->fl_blocked_requests, &new->fl_blocked_requests);
return;
spin_lock(&blocked_lock_lock);
list_splice_init(&fl->fl_blocked_requests, &new->fl_blocked_requests);
- list_for_each_entry(f, &
fl
->fl_blocked_requests, fl_blocked_member)
+ list_for_each_entry(f, &
new
->fl_blocked_requests, fl_blocked_member)
f->fl_blocker = new;
spin_unlock(&blocked_lock_lock);
}
f->fl_blocker = new;
spin_unlock(&blocked_lock_lock);
}