Commit 359c92c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dax-fixes-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull dax fixes from Dan Williams:
 "A fix for an xfstest failure and some and an update that removes an
  fsdax dependency on block devices.

  Summary:

   - Fix RWF_NOWAIT writes to properly return -EAGAIN

   - Clean up an unused helper

   - Update dax_writeback_mapping_range to not need a block_device
     argument"

* tag 'dax-fixes-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax: pass NOWAIT flag to iomap_apply
  dax: Get rid of fs_dax_get_by_host() helper
  dax: Pass dax_dev instead of bdev to dax_writeback_mapping_range()
parents 61a75954 96222d53

drivers/dax/super.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev) 
{

	if (!blk_queue_dax(bdev->bd_queue))

		return NULL;

	return fs_dax_get_by_host(bdev->bd_disk->disk_name);

	return dax_get_by_host(bdev->bd_disk->disk_name);

}

EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev);

#endif

fs/dax.c

+4 −7
Original line number Diff line number Diff line
@@ -937,12 +937,11 @@ static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev, 
 * on persistent storage prior to completion of the operation.

 */

int dax_writeback_mapping_range(struct address_space *mapping,

		struct block_device *bdev, struct writeback_control *wbc)

		struct dax_device *dax_dev, struct writeback_control *wbc)

{

	XA_STATE(xas, &mapping->i_pages, wbc->range_start >> PAGE_SHIFT);

	struct inode *inode = mapping->host;

	pgoff_t end_index = wbc->range_end >> PAGE_SHIFT;

	struct dax_device *dax_dev;

	void *entry;

	int ret = 0;

	unsigned int scanned = 0;
@@ -953,10 +952,6 @@ int dax_writeback_mapping_range(struct address_space *mapping, 
	if (!mapping->nrexceptional || wbc->sync_mode != WB_SYNC_ALL)

		return 0;



	dax_dev = dax_get_by_host(bdev->bd_disk->disk_name);

	if (!dax_dev)

		return -EIO;



	trace_dax_writeback_range(inode, xas.xa_index, end_index);



	tag_pages_for_writeback(mapping, xas.xa_index, end_index);
@@ -977,7 +972,6 @@ int dax_writeback_mapping_range(struct address_space *mapping, 
		xas_lock_irq(&xas);

	}

	xas_unlock_irq(&xas);

	put_dax(dax_dev);

	trace_dax_writeback_range_done(inode, xas.xa_index, end_index);

	return ret;

}
@@ -1207,6 +1201,9 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter, 
		lockdep_assert_held(&inode->i_rwsem);

	}



	if (iocb->ki_flags & IOCB_NOWAIT)

		flags |= IOMAP_NOWAIT;



	while (iov_iter_count(iter)) {

		ret = iomap_apply(inode, pos, iov_iter_count(iter), flags, ops,

				iter, dax_iomap_actor);

fs/ext2/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -960,8 +960,9 @@ ext2_writepages(struct address_space *mapping, struct writeback_control *wbc) 
static int

ext2_dax_writepages(struct address_space *mapping, struct writeback_control *wbc)

{

	return dax_writeback_mapping_range(mapping,

			mapping->host->i_sb->s_bdev, wbc);

	struct ext2_sb_info *sbi = EXT2_SB(mapping->host->i_sb);



	return dax_writeback_mapping_range(mapping, sbi->s_daxdev, wbc);

}



const struct address_space_operations ext2_aops = {

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2867,7 +2867,7 @@ static int ext4_dax_writepages(struct address_space *mapping, 
	percpu_down_read(&sbi->s_journal_flag_rwsem);

	trace_ext4_writepages(inode, wbc);



	ret = dax_writeback_mapping_range(mapping, inode->i_sb->s_bdev, wbc);

	ret = dax_writeback_mapping_range(mapping, sbi->s_daxdev, wbc);

	trace_ext4_writepages_result(inode, wbc, ret,

				     nr_to_write - wbc->nr_to_write);

	percpu_up_read(&sbi->s_journal_flag_rwsem);

fs/xfs/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ xfs_dax_writepages( 


	xfs_iflags_clear(ip, XFS_ITRUNCATED);

	return dax_writeback_mapping_range(mapping,

			xfs_inode_buftarg(ip)->bt_bdev, wbc);

			xfs_inode_buftarg(ip)->bt_daxdev, wbc);

}



STATIC sector_t

CRA Git | Maintained and supported by SUSTech CRA and CCSE