From 2ece529f73a56bbbeef30746ebab043e0a26f2ef Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 29 Aug 2006 19:06:07 +0100
Subject: [PATCH] --- yaml --- r: 37575 b: refs/heads/master c:
 7b0de42d7c5a471741ede4e71727d88000e6ea59 h: refs/heads/master i:   37573:
 c8458047f43332520b9abc2b065561cfe03ca032   37571:
 dbe545e09ae44efefd18f35e258b515cb68980d1   37567:
 b705c4e71705000925ac55d31d037a661c7b736d v: v3

---
 [refs]                  | 2 +-
 trunk/fs/fs-writeback.c | 6 +++---
 trunk/fs/internal.h     | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 605217b1a1e4..ded249512bb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07f3f05c1e3052b8656129b2a5aca9f888241a34
+refs/heads/master: 7b0de42d7c5a471741ede4e71727d88000e6ea59
diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c
index 0639024d83a9..c403b66ec83c 100644
--- a/trunk/fs/fs-writeback.c
+++ b/trunk/fs/fs-writeback.c
@@ -319,7 +319,7 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
 
 		if (!bdi_cap_writeback_dirty(bdi)) {
 			list_move(&inode->i_list, &sb->s_dirty);
-			if (sb == blockdev_superblock) {
+			if (sb_is_blkdev_sb(sb)) {
 				/*
 				 * Dirty memory-backed blockdev: the ramdisk
 				 * driver does this.  Skip just this inode
@@ -336,14 +336,14 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
 
 		if (wbc->nonblocking && bdi_write_congested(bdi)) {
 			wbc->encountered_congestion = 1;
-			if (sb != blockdev_superblock)
+			if (!sb_is_blkdev_sb(sb))
 				break;		/* Skip a congested fs */
 			list_move(&inode->i_list, &sb->s_dirty);
 			continue;		/* Skip a congested blockdev */
 		}
 
 		if (wbc->bdi && bdi != wbc->bdi) {
-			if (sb != blockdev_superblock)
+			if (!sb_is_blkdev_sb(sb))
 				break;		/* fs has the wrong queue */
 			list_move(&inode->i_list, &sb->s_dirty);
 			continue;		/* blockdev has wrong queue */
diff --git a/trunk/fs/internal.h b/trunk/fs/internal.h
index c21ecd37b1e7..f662b703bb97 100644
--- a/trunk/fs/internal.h
+++ b/trunk/fs/internal.h
@@ -17,6 +17,8 @@
 extern struct super_block *blockdev_superblock;
 extern void __init bdev_cache_init(void);
 
+#define sb_is_blkdev_sb(sb) ((sb) == blockdev_superblock)
+
 /*
  * char_dev.c
  */