The patch titled
BLOCK: Remove dependence on existence of blockdev_superblock
has been added to the -mm tree. Its filename is
block-remove-dependence-on-existence-of-blockdev_superblock.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: BLOCK: Remove dependence on existence of blockdev_superblock
From: David Howells <dhowells@xxxxxxxxxx>
Move blockdev_superblock extern declaration from fs/fs-writeback.c to a
headerfile and remove the dependence on it by wrapping it in a macro.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/fs-writeback.c | 6 +++---
fs/internal.h | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff -puN fs/fs-writeback.c~block-remove-dependence-on-existence-of-blockdev_superblock fs/fs-writeback.c
--- a/fs/fs-writeback.c~block-remove-dependence-on-existence-of-blockdev_superblock
+++ a/fs/fs-writeback.c
@@ -319,7 +319,7 @@ sync_sb_inodes(struct super_block *sb, s
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, s
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 -puN fs/internal.h~block-remove-dependence-on-existence-of-blockdev_superblock fs/internal.h
--- a/fs/internal.h~block-remove-dependence-on-existence-of-blockdev_superblock
+++ a/fs/internal.h
@@ -19,6 +19,8 @@ struct super_block;
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
*/
_
Patches currently in -mm which might be from dhowells@xxxxxxxxxx are
git-gfs2.patch
git-nfs.patch
nfs-replace-null-dentries-that-appear-in-readdirs-list-2.patch
binfmt_elf-consistently-use-loff_t.patch
afs-add-lock-annotations-to-afs_proc_cell_servers_startstop.patch
elf_fdpic_core_dump-dont-take-tasklist_lock.patch
simplify-update_times-avoid-jiffies-jiffies_64-aliasing-problem-2.patch
lib-rwsemc-un-inline-rwsem_down_failed_common.patch
reiserfs-make-sure-all-dentries-refs-are-released-before-calling-kill_block_super-try-2.patch
fs-cache-provide-a-filesystem-specific-syncable-page-bit.patch
fs-cache-generic-filesystem-caching-facility.patch
fs-cache-release-page-private-in-failed-readahead.patch
fs-cache-release-page-private-after-failed-readahead-12.patch
fs-cache-make-kafs-use-fs-cache.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-12.patch
fs-cache-make-kafs-use-fs-cache-12-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching.patch
nfs-use-local-caching-12.patch
nfs-use-local-caching-12-fix.patch
fs-cache-cachefiles-ia64-missing-copy_page-export.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes.patch
autofs-make-sure-all-dentries-refs-are-released-before-calling-kill_anon_super.patch
vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch
nfs-represent-64-bit-fileids-as-64-bit-inode-numbers-on-32-bit-systems.patch
ecryptfs-get_sb_dev-fix.patch
block-move-functions-out-of-buffer-code.patch
block-remove-duplicate-declaration-of-exit_io_context.patch
block-stop-fallback_migrate_page-from-using-page_has_buffers.patch
block-separate-the-bounce-buffering-code-from-the-highmem-code.patch
block-dont-call-block_sync_page-from-afs.patch
block-move-extern-declarations-out-of-fs-c-into-header-files.patch
block-move-extern-declarations-out-of-fs-c-into-header-files-tidy.patch
block-remove-dependence-on-existence-of-blockdev_superblock.patch
block-remove-dependence-on-existence-of-blockdev_superblock-tidy.patch
block-dissociate-generic_writepages-from-mpage-stuff.patch
block-move-__invalidate_device-to-block_devc.patch
block-move-the-loop-device-ioctl-compat-stuff-to-the-loop-driver.patch
block-move-common-fs-specific-ioctls-to-linux-fsh.patch
block-move-the-reiserfs-device-ioctl-compat-stuff-to-the-reiserfs-driver.patch
block-move-the-ext2-device-ioctl-compat-stuff-to-the-ext2-driver.patch
block-move-the-ext3-device-ioctl-compat-stuff-to-the-ext3-driver.patch
block-move-the-msdos-device-ioctl-compat-stuff-to-the-msdos-driver.patch
block-remove-no-longer-necessary-linux-mpageh-inclusions.patch
block-remove-no-longer-necessary-linux-buffer_headh-inclusions.patch
block-make-usb-storage-depend-on-scsi-rather-than-selecting-it.patch
block-make-it-possible-to-disable-the-block-layer.patch
block-make-it-possible-to-disable-the-block-layer-tidy.patch
block-make-it-possible-to-disable-the-block-layer-tidy-fix.patch
reiser4-get_sb_dev-fix.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
