Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] BLOCK: Remove dependence on existence of blockdev_superblock [try #6]

Browse source 
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@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
David Howells 2006-08-29 19:06:07 +01:00 committed by Jens Axboe
parent 07f3f05c1e
commit 7b0de42d7c
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/fs-writeback.c
View file

@ -319,7 +319,7 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
if (!bdi_cap_writeback_dirty(bdi)) { if (!bdi_cap_writeback_dirty(bdi)) {
list_move(&inode->i_list, &sb->s_dirty); list_move(&inode->i_list, &sb->s_dirty);
if (sb == blockdev_superblock) { if (sb_is_blkdev_sb(sb)) {
/* /*
* Dirty memory-backed blockdev: the ramdisk * Dirty memory-backed blockdev: the ramdisk
* driver does this. Skip just this inode * 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)) { if (wbc->nonblocking && bdi_write_congested(bdi)) {
wbc->encountered_congestion = 1; wbc->encountered_congestion = 1;
if (sb != blockdev_superblock) if (!sb_is_blkdev_sb(sb))
break; /* Skip a congested fs */ break; /* Skip a congested fs */
list_move(&inode->i_list, &sb->s_dirty); list_move(&inode->i_list, &sb->s_dirty);
continue; /* Skip a congested blockdev */ continue; /* Skip a congested blockdev */
} }
if (wbc->bdi && bdi != wbc->bdi) { if (wbc->bdi && bdi != wbc->bdi) {
if (sb != blockdev_superblock) if (!sb_is_blkdev_sb(sb))
break; /* fs has the wrong queue */ break; /* fs has the wrong queue */
list_move(&inode->i_list, &sb->s_dirty); list_move(&inode->i_list, &sb->s_dirty);
continue; /* blockdev has wrong queue */ continue; /* blockdev has wrong queue */

2
fs/internal.h
View file

@ -17,6 +17,8 @@
extern struct super_block *blockdev_superblock; extern struct super_block *blockdev_superblock;
extern void __init bdev_cache_init(void); extern void __init bdev_cache_init(void);
#define sb_is_blkdev_sb(sb) ((sb) == blockdev_superblock)
/* /*
* char_dev.c * char_dev.c
*/ */