From cf02422449d4603d44993d4dbff0a00067c6211b Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Wed, 6 Feb 2008 01:37:08 -0800 Subject: [PATCH] --- yaml --- r: 83426 b: refs/heads/master c: 797074e44d78835adbde2ca527718b0e50226b95 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/fs-writeback.c | 7 ++----- trunk/include/linux/fs.h | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 590198551847..6d51d57cd80b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8462caa915d4d12846db7aae2557b6db7c054d5 +refs/heads/master: 797074e44d78835adbde2ca527718b0e50226b95 diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c index 0b3064079fa5..db80ce9eb1d0 100644 --- a/trunk/fs/fs-writeback.c +++ b/trunk/fs/fs-writeback.c @@ -515,8 +515,7 @@ writeback_inodes(struct writeback_control *wbc) might_sleep(); spin_lock(&sb_lock); restart: - sb = sb_entry(super_blocks.prev); - for (; sb != sb_entry(&super_blocks); sb = sb_entry(sb->s_list.prev)) { + list_for_each_entry_reverse(sb, &super_blocks, s_list) { if (sb_has_dirty_inodes(sb)) { /* we're making our own get_super here */ sb->s_count++; @@ -581,10 +580,8 @@ static void set_sb_syncing(int val) { struct super_block *sb; spin_lock(&sb_lock); - sb = sb_entry(super_blocks.prev); - for (; sb != sb_entry(&super_blocks); sb = sb_entry(sb->s_list.prev)) { + list_for_each_entry_reverse(sb, &super_blocks, s_list) sb->s_syncing = val; - } spin_unlock(&sb_lock); } diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index e260d9a32c21..19aab50c3b8e 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -977,7 +977,6 @@ extern int send_sigurg(struct fown_struct *fown); extern struct list_head super_blocks; extern spinlock_t sb_lock; -#define sb_entry(list) list_entry((list), struct super_block, s_list) #define S_BIAS (1<<30) struct super_block { struct list_head s_list; /* Keep this first */