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

Commit 20a90f58 authored by Ross Zwisler's avatar Ross Zwisler Committed by Linus Torvalds
Browse files

dax: give DAX clearing code correct bdev 



dax_clear_blocks() needs a valid struct block_device and previously it
was using inode->i_sb->s_bdev in all cases.  This is correct for normal
inodes on mounted ext2, ext4 and XFS filesystems, but is incorrect for
DAX raw block devices and for XFS real-time devices.

Instead, rename dax_clear_blocks() to dax_clear_sectors(), and change
its arguments to take a bdev and a sector instead of an inode and a
block.  This better reflects what the function does, and it allows the
filesystem and raw block device code to pass in an appropriate struct
block_device.

Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Suggested-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Jens Axboe <axboe@fb.com>
Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 73f34a5e

fs/dax.c

+4 −5
Original line number Diff line number Diff line
@@ -79,15 +79,14 @@ struct page *read_dax_sector(struct block_device *bdev, sector_t n) 
}



/*

 * dax_clear_blocks() is called from within transaction context from XFS,

 * dax_clear_sectors() is called from within transaction context from XFS,

 * and hence this means the stack from this point must follow GFP_NOFS

 * semantics for all operations.

 */

int dax_clear_blocks(struct inode *inode, sector_t block, long _size)

int dax_clear_sectors(struct block_device *bdev, sector_t _sector, long _size)

{

	struct block_device *bdev = inode->i_sb->s_bdev;

	struct blk_dax_ctl dax = {

		.sector = block << (inode->i_blkbits - 9),

		.sector = _sector,

		.size = _size,

	};
@@ -109,7 +108,7 @@ int dax_clear_blocks(struct inode *inode, sector_t block, long _size) 
	wmb_pmem();

	return 0;

}

EXPORT_SYMBOL_GPL(dax_clear_blocks);

EXPORT_SYMBOL_GPL(dax_clear_sectors);



/* the clear_pmem() calls are ordered by a wmb_pmem() in the caller */

static void dax_new_buf(void __pmem *addr, unsigned size, unsigned first,

fs/ext2/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -737,7 +737,9 @@ static int ext2_get_blocks(struct inode *inode, 
		 * so that it's not found by another thread before it's

		 * initialised

		 */

		err = dax_clear_blocks(inode, le32_to_cpu(chain[depth-1].key),

		err = dax_clear_sectors(inode->i_sb->s_bdev,

				le32_to_cpu(chain[depth-1].key) <<

				(inode->i_blkbits - 9),

				1 << inode->i_blkbits);

		if (err) {

			mutex_unlock(&ei->truncate_mutex);

fs/xfs/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ xfs_count_page_state( 
	} while ((bh = bh->b_this_page) != head);

}



STATIC struct block_device *

struct block_device *

xfs_find_bdev_for_inode(

	struct inode		*inode)

{

fs/xfs/xfs_aops.h

+1 −0
Original line number Diff line number Diff line
@@ -62,5 +62,6 @@ int xfs_get_blocks_dax_fault(struct inode *inode, sector_t offset, 
			         struct buffer_head *map_bh, int create);



extern void xfs_count_page_state(struct page *, int *, int *);

extern struct block_device *xfs_find_bdev_for_inode(struct inode *);



#endif /* __XFS_AOPS_H__ */

fs/xfs/xfs_bmap_util.c

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ xfs_zero_extent( 
	ssize_t		size = XFS_FSB_TO_B(mp, count_fsb);



	if (IS_DAX(VFS_I(ip)))

		return dax_clear_blocks(VFS_I(ip), block, size);

		return dax_clear_sectors(xfs_find_bdev_for_inode(VFS_I(ip)),

				sector, size);



	/*

	 * let the block layer decide on the fastest method of