Commit f56753ac authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} with a single flag 



Replace the two negative flags that are always used together with a
single positive flag that indicates the writeback capability instead
of two related non-capabilities.  Also remove the pointless wrappers
to just check the flag.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 823423ef

fs/9p/vfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static void v9fs_mmap_vm_close(struct vm_area_struct *vma) 


	inode = file_inode(vma->vm_file);



	if (!mapping_cap_writeback_dirty(inode->i_mapping))

	if (!mapping_can_writeback(inode->i_mapping))

		wbc.nr_to_write = 0;



	might_sleep();

fs/fs-writeback.c

+4 −3
Original line number Diff line number Diff line
@@ -2321,7 +2321,7 @@ void __mark_inode_dirty(struct inode *inode, int flags) 


			wb = locked_inode_to_wb_and_lock_list(inode);



			WARN(bdi_cap_writeback_dirty(wb->bdi) &&

			WARN((wb->bdi->capabilities & BDI_CAP_WRITEBACK) &&

			     !test_bit(WB_registered, &wb->state),

			     "bdi-%s not registered\n", bdi_dev_name(wb->bdi));
@@ -2346,7 +2346,8 @@ void __mark_inode_dirty(struct inode *inode, int flags) 
			 * to make sure background write-back happens

			 * later.

			 */

			if (bdi_cap_writeback_dirty(wb->bdi) && wakeup_bdi)

			if (wakeup_bdi &&

			    (wb->bdi->capabilities & BDI_CAP_WRITEBACK))

				wb_wakeup_delayed(wb);

			return;

		}
@@ -2581,7 +2582,7 @@ int write_inode_now(struct inode *inode, int sync) 
		.range_end = LLONG_MAX,

	};



	if (!mapping_cap_writeback_dirty(inode->i_mapping))

	if (!mapping_can_writeback(inode->i_mapping))

		wbc.nr_to_write = 0;



	might_sleep();

include/linux/backing-dev.h

+10 −38
Original line number Diff line number Diff line
@@ -110,27 +110,14 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio); 
/*

 * Flags in backing_dev_info::capability

 *

 * The first three flags control whether dirty pages will contribute to the

 * VM's accounting and whether writepages() should be called for dirty pages

 * (something that would not, for example, be appropriate for ramfs)

 *

 * WARNING: these flags are closely related and should not normally be

 * used separately.  The BDI_CAP_NO_ACCT_AND_WRITEBACK combines these

 * three flags into a single convenience macro.

 *

 * BDI_CAP_NO_ACCT_DIRTY:  Dirty pages shouldn't contribute to accounting

 * BDI_CAP_NO_WRITEBACK:   Don't write pages back

 * BDI_CAP_WRITEBACK:		Supports dirty page writeback, and dirty pages

 *				should contribute to accounting

 * BDI_CAP_WRITEBACK_ACCT:	Automatically account writeback pages

 * BDI_CAP_STRICTLIMIT:    Keep number of dirty pages below bdi threshold.

 * BDI_CAP_STRICTLIMIT:		Keep number of dirty pages below bdi threshold

 */

#define BDI_CAP_NO_ACCT_DIRTY	0x00000001

#define BDI_CAP_NO_WRITEBACK	0x00000002

#define BDI_CAP_WRITEBACK_ACCT	0x00000004

#define BDI_CAP_STRICTLIMIT	0x00000010

#define BDI_CAP_CGROUP_WRITEBACK 0x00000020



#define BDI_CAP_NO_ACCT_AND_WRITEBACK \

	(BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY)

#define BDI_CAP_WRITEBACK		(1 << 0)

#define BDI_CAP_WRITEBACK_ACCT		(1 << 1)

#define BDI_CAP_STRICTLIMIT		(1 << 2)



extern struct backing_dev_info noop_backing_dev_info;
@@ -169,24 +156,9 @@ static inline int wb_congested(struct bdi_writeback *wb, int cong_bits) 
long congestion_wait(int sync, long timeout);

long wait_iff_congested(int sync, long timeout);



static inline bool bdi_cap_writeback_dirty(struct backing_dev_info *bdi)

{

	return !(bdi->capabilities & BDI_CAP_NO_WRITEBACK);

}



static inline bool bdi_cap_account_dirty(struct backing_dev_info *bdi)

{

	return !(bdi->capabilities & BDI_CAP_NO_ACCT_DIRTY);

}



static inline bool mapping_cap_writeback_dirty(struct address_space *mapping)

{

	return bdi_cap_writeback_dirty(inode_to_bdi(mapping->host));

}



static inline bool mapping_cap_account_dirty(struct address_space *mapping)

static inline bool mapping_can_writeback(struct address_space *mapping)

{

	return bdi_cap_account_dirty(inode_to_bdi(mapping->host));

	return inode_to_bdi(mapping->host)->capabilities & BDI_CAP_WRITEBACK;

}



static inline int bdi_sched_wait(void *word)
@@ -223,7 +195,7 @@ static inline bool inode_cgwb_enabled(struct inode *inode) 


	return cgroup_subsys_on_dfl(memory_cgrp_subsys) &&

		cgroup_subsys_on_dfl(io_cgrp_subsys) &&

		bdi_cap_account_dirty(bdi) &&

		(bdi->capabilities & BDI_CAP_WRITEBACK) &&

		(inode->i_sb->s_iflags & SB_I_CGROUPWB);

}

mm/backing-dev.c

+2 −4
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ 
#include <linux/device.h>

#include <trace/events/writeback.h>



struct backing_dev_info noop_backing_dev_info = {

	.capabilities	= BDI_CAP_NO_ACCT_AND_WRITEBACK,

};

struct backing_dev_info noop_backing_dev_info;

EXPORT_SYMBOL_GPL(noop_backing_dev_info);



static struct class *bdi_class;
@@ -745,7 +743,7 @@ struct backing_dev_info *bdi_alloc(int node_id) 
		kfree(bdi);

		return NULL;

	}

	bdi->capabilities = BDI_CAP_WRITEBACK_ACCT;

	bdi->capabilities = BDI_CAP_WRITEBACK | BDI_CAP_WRITEBACK_ACCT;

	bdi->ra_pages = VM_READAHEAD_PAGES;

	bdi->io_pages = VM_READAHEAD_PAGES;

	return bdi;

mm/filemap.c

+2 −2
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ int __filemap_fdatawrite_range(struct address_space *mapping, loff_t start, 
		.range_end = end,

	};



	if (!mapping_cap_writeback_dirty(mapping) ||

	if (!mapping_can_writeback(mapping) ||

	    !mapping_tagged(mapping, PAGECACHE_TAG_DIRTY))

		return 0;
@@ -1702,7 +1702,7 @@ repeat: 
no_page:

	if (!page && (fgp_flags & FGP_CREAT)) {

		int err;

		if ((fgp_flags & FGP_WRITE) && mapping_cap_account_dirty(mapping))

		if ((fgp_flags & FGP_WRITE) && mapping_can_writeback(mapping))

			gfp_mask |= __GFP_WRITE;

		if (fgp_flags & FGP_NOFS)

			gfp_mask &= ~__GFP_FS;

CRA Git | Maintained and supported by SUSTech CRA and CCSE