From 4c850a61c3e73ac5bd137fe1cb2923f4a295446c Mon Sep 17 00:00:00 2001
From: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Date: Thu, 5 May 2011 12:56:51 +0900
Subject: [PATCH] --- yaml --- r: 247932 b: refs/heads/master c:
 0cc1283881d3fcc9011c713e067795ccec322ae7 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/fs/nilfs2/recovery.c | 12 ++++++------
 trunk/fs/nilfs2/segment.c  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0c38ecda6556..aa4914f73557 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 293ce0ed8c2d22ff044e6e9fa7b1d4be425d189b
+refs/heads/master: 0cc1283881d3fcc9011c713e067795ccec322ae7
diff --git a/trunk/fs/nilfs2/recovery.c b/trunk/fs/nilfs2/recovery.c
index ba4a64518f38..a604ac0331b2 100644
--- a/trunk/fs/nilfs2/recovery.c
+++ b/trunk/fs/nilfs2/recovery.c
@@ -387,9 +387,9 @@ static int nilfs_scan_dsync_log(struct the_nilfs *nilfs, sector_t start_blocknr,
 static void dispose_recovery_list(struct list_head *head)
 {
 	while (!list_empty(head)) {
-		struct nilfs_recovery_block *rb
-			= list_entry(head->next,
-				     struct nilfs_recovery_block, list);
+		struct nilfs_recovery_block *rb;
+
+		rb = list_first_entry(head, struct nilfs_recovery_block, list);
 		list_del(&rb->list);
 		kfree(rb);
 	}
@@ -416,9 +416,9 @@ static int nilfs_segment_list_add(struct list_head *head, __u64 segnum)
 void nilfs_dispose_segment_list(struct list_head *head)
 {
 	while (!list_empty(head)) {
-		struct nilfs_segment_entry *ent
-			= list_entry(head->next,
-				     struct nilfs_segment_entry, list);
+		struct nilfs_segment_entry *ent;
+
+		ent = list_first_entry(head, struct nilfs_segment_entry, list);
 		list_del(&ent->list);
 		kfree(ent);
 	}
diff --git a/trunk/fs/nilfs2/segment.c b/trunk/fs/nilfs2/segment.c
index 8a2b428b1838..186cabbe54d7 100644
--- a/trunk/fs/nilfs2/segment.c
+++ b/trunk/fs/nilfs2/segment.c
@@ -957,8 +957,8 @@ static int nilfs_segctor_apply_buffers(struct nilfs_sc_info *sci,
 
  dispose_buffers:
 	while (!list_empty(listp)) {
-		bh = list_entry(listp->next, struct buffer_head,
-				b_assoc_buffers);
+		bh = list_first_entry(listp, struct buffer_head,
+				      b_assoc_buffers);
 		list_del_init(&bh->b_assoc_buffers);
 		brelse(bh);
 	}