Skip to contentSkip to conversation

Use list_first_entry in locks_wake_up_blocks

PATCH In review Pavel Emelyanov 2 participants 2 messages Sep 19, 2007

Subsystems (2)
VFS File locking (flock() and fcntl()/lockf())
lore
Share & tools
lore

Pavel Emelyanov

author
#0 lore raw

PATCH 1/1 Use list_first_entry in locks_wake_up_blocks

This routine deletes all the elements from the list with the "while (!list_empty())" loop, and we already have a list_first_entry() macro to help it look nicer :)

Signed-off-by Pavel Emelyanov <[email protected]>

---

fs/locks.c +3 -1
index 746dc70..5fa072a 100644
@@ -534,7 +534,9 @@ static void locks_insert_block(struct fi
 static void locks_wake_up_blocks(struct file_lock *blocker)
 {
 	while (!list_empty(&blocker->fl_block)) {
-		struct file_lock *waiter = list_entry(blocker->fl_block.next,
+		struct file_lock *waiter;
+
+		waiter = list_first_entry(&blocker->fl_block,
 				struct file_lock, fl_block);
 		__locks_delete_block(waiter);
 		if (waiter->fl_lmops && waiter->fl_lmops->fl_notify)
#1 lore raw
Quoted 3 lines · Pavel Emelyanov

This routine deletes all the elements from the list with the "while (!list_empty())" loop, and we already have a list_first_entry() macro to help it look nicer :)

OK.

--b.

Quoted 20 lines
Signed-off-by Pavel Emelyanov <[email protected]>

---

fs/locks.c +3 -1
index 746dc70..5fa072a 100644
@@ -534,7 +534,9 @@ static void locks_insert_block(struct fi
 static void locks_wake_up_blocks(struct file_lock *blocker)
 {
 	while (!list_empty(&blocker->fl_block)) {
-		struct file_lock *waiter = list_entry(blocker->fl_block.next,
+		struct file_lock *waiter;
+
+		waiter = list_first_entry(&blocker->fl_block,
 				struct file_lock, fl_block);
 		__locks_delete_block(waiter);
 		if (waiter->fl_lmops && waiter->fl_lmops->fl_notify)