Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 089eed29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  writeback: always use sb->s_bdi for writeback purposes
parents 34984f54 aaead25b
Loading
Loading
Loading
Loading
+4 −15
Original line number Diff line number Diff line
@@ -72,23 +72,12 @@ int writeback_in_progress(struct backing_dev_info *bdi)
static inline struct backing_dev_info *inode_to_bdi(struct inode *inode)
{
	struct super_block *sb = inode->i_sb;
	struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info;

	/*
	 * For inodes on standard filesystems, we use superblock's bdi. For
	 * inodes on virtual filesystems, we want to use inode mapping's bdi
	 * because they can possibly point to something useful (think about
	 * block_dev filesystem).
	 */
	if (sb->s_bdi && sb->s_bdi != &noop_backing_dev_info) {
		/* Some device inodes could play dirty tricks. Catch them... */
		WARN(bdi != sb->s_bdi && bdi_cap_writeback_dirty(bdi),
			"Dirtiable inode bdi %s != sb bdi %s\n",
			bdi->name, sb->s_bdi->name);
	if (strcmp(sb->s_type->name, "bdev") == 0)
		return inode->i_mapping->backing_dev_info;

	return sb->s_bdi;
}
	return bdi;
}

static void bdi_queue_work(struct backing_dev_info *bdi,
		struct wb_writeback_work *work)