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

Merge tag 'vfs-6.10-rc2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs fixes from Christian Brauner:

 - Fix io_uring based write-through after converting cifs to use the
   netfs library

 - Fix aio error handling when doing write-through via netfs library

 - Fix performance regression in iomap when used with non-large folio
   mappings

 - Fix signalfd error code

 - Remove obsolete comment in signalfd code

 - Fix async request indication in netfs_perform_write() by raising
   BDP_ASYNC when IOCB_NOWAIT is set

 - Yield swap device immediately to prevent spurious EBUSY errors

 - Don't cross a .backup mountpoint from backup volumes in afs to avoid
   infinite loops

 - Fix a race between umount and async request completion in 9p after 9p
   was converted to use the netfs library

* tag 'vfs-6.10-rc2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  netfs, 9p: Fix race between umount and async request completion
  afs: Don't cross .backup mountpoint from backup volume
  swap: yield device immediately
  netfs: Fix setting of BDP_ASYNC from iocb flags
  signalfd: drop an obsolete comment
  signalfd: fix error return code
  iomap: fault in smaller chunks for non-large folio mappings
  filemap: add helper mapping_max_folio_size()
  netfs: Fix AIO error handling when doing write-through
  netfs: Fix io_uring based write-through
parents 1613e604 f89ea63f

fs/9p/vfs_inode.c

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ void v9fs_evict_inode(struct inode *inode) 
	__le32 __maybe_unused version;



	if (!is_bad_inode(inode)) {

		netfs_wait_for_outstanding_io(inode);

		truncate_inode_pages_final(&inode->i_data);



		version = cpu_to_le32(v9inode->qid.version);

fs/afs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -648,6 +648,7 @@ void afs_evict_inode(struct inode *inode) 


	ASSERTCMP(inode->i_ino, ==, vnode->fid.vnode);



	netfs_wait_for_outstanding_io(inode);

	truncate_inode_pages_final(&inode->i_data);



	afs_set_cache_aux(vnode, &aux);

fs/afs/mntpt.c

+5 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt) 
		put_page(page);

		if (ret < 0)

			return ret;



		/* Don't cross a backup volume mountpoint from a backup volume */

		if (src_as->volume && src_as->volume->type == AFSVL_BACKVOL &&

		    ctx->type == AFSVL_BACKVOL)

			return -ENODEV;

	}



	return 0;

fs/iomap/buffered-io.c

+1 −1
Original line number Diff line number Diff line
@@ -898,11 +898,11 @@ static bool iomap_write_end(struct iomap_iter *iter, loff_t pos, size_t len, 
static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i)

{

	loff_t length = iomap_length(iter);

	size_t chunk = PAGE_SIZE << MAX_PAGECACHE_ORDER;

	loff_t pos = iter->pos;

	ssize_t total_written = 0;

	long status = 0;

	struct address_space *mapping = iter->inode->i_mapping;

	size_t chunk = mapping_max_folio_size(mapping);

	unsigned int bdp_flags = (iter->flags & IOMAP_NOWAIT) ? BDP_ASYNC : 0;



	do {

fs/netfs/buffered_write.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, 
	struct folio *folio, *writethrough = NULL;

	enum netfs_how_to_modify howto;

	enum netfs_folio_trace trace;

	unsigned int bdp_flags = (iocb->ki_flags & IOCB_SYNC) ? 0: BDP_ASYNC;

	unsigned int bdp_flags = (iocb->ki_flags & IOCB_NOWAIT) ? BDP_ASYNC : 0;

	ssize_t written = 0, ret, ret2;

	loff_t i_size, pos = iocb->ki_pos, from, to;

	size_t max_chunk = PAGE_SIZE << MAX_PAGECACHE_ORDER;