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

Merge tag 'fs_for_v6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull isofs, udf, quota, ext2, and reiserfs updates from Jan Kara:

 - convert isofs to the new mount API

 - cleanup isofs Makefile

 - udf conversion to folios

 - some other small udf cleanups and fixes

 - ext2 cleanups

 - removal of reiserfs .writepage method

 - update reiserfs README file

* tag 'fs_for_v6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  isofs: Use *-y instead of *-objs in Makefile
  ext2: Remove LEGACY_DIRECT_IO dependency
  isofs: Remove calls to set/clear the error flag
  ext2: Remove call to folio_set_error()
  udf: Use a folio in udf_write_end()
  udf: Convert udf_page_mkwrite() to use a folio
  udf: Convert udf_symlink_getattr() to use a folio
  udf: Convert udf_adinicb_readpage() to udf_adinicb_read_folio()
  udf: Convert udf_expand_file_adinicb() to use a folio
  udf: Convert udf_write_begin() to use a folio
  udf: Convert udf_symlink_filler() to use a folio
  reiserfs: Trim some README bits
  quota: fix to propagate error of mark_dquot_dirty() to caller
  reiserfs: Convert to writepages
  udf: udftime: prevent overflow in udf_disk_stamp_to_time()
  ext2: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method
  udf: replace deprecated strncpy/strcpy with strscpy
  udf: Remove second semicolon
  isofs: convert isofs to use the new mount API
  fs: quota: use group allocation of per-cpu counters API
parents d0e71e23 1dd719a9

fs/ext2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ config EXT2_FS 
	tristate "Second extended fs support (DEPRECATED)"

	select BUFFER_HEAD

	select FS_IOMAP

	select LEGACY_DIRECT_IO

	help

	  Ext2 is a standard Linux file system for hard disks.

fs/ext2/dir.c

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ static bool ext2_check_folio(struct folio *folio, int quiet, char *kaddr) 
			(unsigned long) le32_to_cpu(p->inode));

	}

fail:

	folio_set_error(folio);

	return false;

}

fs/ext2/file.c

+7 −1
Original line number Diff line number Diff line
@@ -302,6 +302,12 @@ static ssize_t ext2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	return generic_file_write_iter(iocb, from);

}



static int ext2_file_open(struct inode *inode, struct file *filp)

{

	filp->f_mode |= FMODE_CAN_ODIRECT;

	return dquot_file_open(inode, filp);

}



const struct file_operations ext2_file_operations = {

	.llseek		= generic_file_llseek,

	.read_iter	= ext2_file_read_iter,
@@ -311,7 +317,7 @@ const struct file_operations ext2_file_operations = { 
	.compat_ioctl	= ext2_compat_ioctl,

#endif

	.mmap		= ext2_file_mmap,

	.open		= dquot_file_open,

	.open		= ext2_file_open,

	.release	= ext2_release_file,

	.fsync		= ext2_fsync,

	.get_unmapped_area = thp_get_unmapped_area,

fs/ext2/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -965,7 +965,6 @@ const struct address_space_operations ext2_aops = { 
	.write_begin		= ext2_write_begin,

	.write_end		= ext2_write_end,

	.bmap			= ext2_bmap,

	.direct_IO		= noop_direct_IO,

	.writepages		= ext2_writepages,

	.migrate_folio		= buffer_migrate_folio,

	.is_partially_uptodate	= block_is_partially_uptodate,
@@ -974,7 +973,6 @@ const struct address_space_operations ext2_aops = { 


static const struct address_space_operations ext2_dax_aops = {

	.writepages		= ext2_dax_writepages,

	.direct_IO		= noop_direct_IO,

	.dirty_folio		= noop_dirty_folio,

};

fs/isofs/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


obj-$(CONFIG_ISO9660_FS) += isofs.o



isofs-objs-y 			:= namei.o inode.o dir.o util.o rock.o export.o

isofs-objs-$(CONFIG_JOLIET)	+= joliet.o

isofs-objs-$(CONFIG_ZISOFS)	+= compress.o

isofs-objs			:= $(isofs-objs-y)
 
isofs-y 		:= namei.o inode.o dir.o util.o rock.o export.o

isofs-$(CONFIG_JOLIET)	+= joliet.o

isofs-$(CONFIG_ZISOFS)	+= compress.o