Commit a12e4d30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block 

* 'writeback' of git://git.kernel.dk/linux-2.6-block:
  writeback: check for registered bdi in flusher add and inode dirty
  writeback: add name to backing_dev_info
  writeback: add some debug inode list counters to bdi stats
  writeback: get rid of pdflush completely
  writeback: switch to per-bdi threads for flushing data
  writeback: move dirty inodes from super_block to backing_dev_info
  writeback: get rid of generic_sync_sb_inodes() export
parents 89af571c 500b067c

block/blk-core.c

+1 −0
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 
			(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;

	q->backing_dev_info.state = 0;

	q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;

	q->backing_dev_info.name = "block";



	err = bdi_init(&q->backing_dev_info);

	if (err) {

drivers/block/aoe/aoeblk.c

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ aoeblk_gdalloc(void *vp) 
	if (!d->blkq)

		goto err_mempool;

	blk_queue_make_request(d->blkq, aoeblk_make_request);

	d->blkq->backing_dev_info.name = "aoe";

	if (bdi_init(&d->blkq->backing_dev_info))

		goto err_blkq;

	spin_lock_irqsave(&d->lock, flags);

drivers/char/mem.c

+1 −0
Original line number Diff line number Diff line
@@ -822,6 +822,7 @@ static const struct file_operations zero_fops = { 
 * - permits private mappings, "copies" are taken of the source of zeros

 */

static struct backing_dev_info zero_bdi = {

	.name		= "char/mem",

	.capabilities	= BDI_CAP_MAP_COPY,

};

drivers/staging/pohmelfs/inode.c

+1 −8
Original line number Diff line number Diff line
@@ -1950,14 +1950,7 @@ static int pohmelfs_get_sb(struct file_system_type *fs_type, 
 */

static void pohmelfs_kill_super(struct super_block *sb)

{

	struct writeback_control wbc = {

		.sync_mode	= WB_SYNC_ALL,

		.range_start	= 0,

		.range_end	= LLONG_MAX,

		.nr_to_write	= LONG_MAX,

	};

	generic_sync_sb_inodes(sb, &wbc);



	sync_inodes_sb(sb);

	kill_anon_super(sb);

}

fs/btrfs/disk-io.c

+1 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,7 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi) 
{

	int err;



	bdi->name = "btrfs";

	bdi->capabilities = BDI_CAP_MAP_COPY;

	err = bdi_init(bdi);

	if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE