Commit 52034cae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull vfs fixes from Christian Brauner:
 "This contains a few small fixes for this merge window and the attempt
  to handle the ntfs removal regression that was reported a little while
  ago:

   - After the removal of the legacy ntfs driver we received reports
     about regressions for some people that do mount "ntfs" explicitly
     and expect the driver to be available. Since ntfs3 is a drop-in for
     legacy ntfs we alias legacy ntfs to ntfs3 just like ext3 is aliased
     to ext4.

     We also enforce legacy ntfs is always mounted read-only and give it
     custom file operations to ensure that ioctl()'s can't be abused to
     perform write operations.

   - Fix an unbalanced module_get() in bdev_open().

   - Two smaller fixes for the netfs work done earlier in this cycle.

   - Fix the errno returned from the new FS_IOC_GETUUID and
     FS_IOC_GETFSSYSFSPATH ioctls. Both commands just pull information
     out of the superblock so there's no need to call into the actual
     ioctl handlers.

     So instead of returning ENOIOCTLCMD to indicate to fallback we just
     return ENOTTY directly avoiding that indirection"

* tag 'vfs-6.9-rc6.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  netfs: Fix the pre-flush when appending to a file in writethrough mode
  netfs: Fix writethrough-mode error handling
  ntfs3: add legacy ntfs file operations
  ntfs3: enforce read-only when used as legacy ntfs driver
  ntfs3: serve as alias for the legacy ntfs driver
  block: fix module reference leakage from bdev_open_by_dev error path
  fs: Return ENOTTY directly if FS_IOC_GETUUID or FS_IOC_GETFSSYSFSPATH fail
parents 09ef2957 c97f59e2

block/bdev.c

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder, 
		goto abort_claiming;

	ret = -EBUSY;

	if (!bdev_may_open(bdev, mode))

		goto abort_claiming;

		goto put_module;

	if (bdev_is_partition(bdev))

		ret = blkdev_get_part(bdev, mode);

	else

fs/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static int ioctl_getfsuuid(struct file *file, void __user *argp) 
	struct fsuuid2 u = { .len = sb->s_uuid_len, };



	if (!sb->s_uuid_len)

		return -ENOIOCTLCMD;

		return -ENOTTY;



	memcpy(&u.uuid[0], &sb->s_uuid, sb->s_uuid_len);
@@ -781,7 +781,7 @@ static int ioctl_get_fs_sysfs_path(struct file *file, void __user *argp) 
	struct super_block *sb = file_inode(file)->i_sb;



	if (!strlen(sb->s_sysfs_name))

		return -ENOIOCTLCMD;

		return -ENOTTY;



	struct fs_sysfs_path u = {};

fs/netfs/buffered_write.c

+12 −11
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, 
	enum netfs_how_to_modify howto;

	enum netfs_folio_trace trace;

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

	ssize_t written = 0, ret;

	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;

	bool maybe_trouble = false;
@@ -172,14 +172,13 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, 
	if (unlikely(test_bit(NETFS_ICTX_WRITETHROUGH, &ctx->flags) ||

		     iocb->ki_flags & (IOCB_DSYNC | IOCB_SYNC))

	    ) {

		if (pos < i_size_read(inode)) {

		wbc_attach_fdatawrite_inode(&wbc, mapping->host);



		ret = filemap_write_and_wait_range(mapping, pos, pos + iter->count);

		if (ret < 0) {

			wbc_detach_inode(&wbc);

			goto out;

		}

		}



		wbc_attach_fdatawrite_inode(&wbc, mapping->host);



		wreq = netfs_begin_writethrough(iocb, iter->count);

		if (IS_ERR(wreq)) {
@@ -395,10 +394,12 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, 


out:

	if (unlikely(wreq)) {

		ret = netfs_end_writethrough(wreq, iocb);

		ret2 = netfs_end_writethrough(wreq, iocb);

		wbc_detach_inode(&wbc);

		if (ret == -EIOCBQUEUED)

			return ret;

		if (ret2 == -EIOCBQUEUED)

			return ret2;

		if (ret == 0)

			ret = ret2;

	}



	iocb->ki_pos += written;

fs/ntfs3/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -46,3 +46,12 @@ config NTFS3_FS_POSIX_ACL 
	  NOTE: this is linux only feature. Windows will ignore these ACLs.



	  If you don't know what Access Control Lists are, say N.



config NTFS_FS

	tristate "NTFS file system support"

	select NTFS3_FS

	select BUFFER_HEAD

	select NLS

	help

	  This config option is here only for backward compatibility. NTFS

	  filesystem is now handled by the NTFS3 driver.

fs/ntfs3/dir.c

+7 −0
Original line number Diff line number Diff line
@@ -616,4 +616,11 @@ const struct file_operations ntfs_dir_operations = { 
	.compat_ioctl   = ntfs_compat_ioctl,

#endif

};



const struct file_operations ntfs_legacy_dir_operations = {

	.llseek		= generic_file_llseek,

	.read		= generic_read_dir,

	.iterate_shared	= ntfs_readdir,

	.open		= ntfs_file_open,

};

// clang-format on