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

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

Pull reiserfs updates from Jan Kara:
 "The biggest change in this pull is the addition of a deprecation
  message about reiserfs with the outlook that we'd eventually be able
  to remove it from the kernel. Because it is practically unmaintained
  and untested and odd enough that people don't want to bother with it
  anymore...

  Otherwise there are small udf and ext2 fixes"

* tag 'fs_for_v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: remove redundant assignment of variable etype
  reiserfs: Deprecate reiserfs
  ext2: correct max file size computing
  reiserfs: get rid of AOP_FLAG_CONT_EXPAND flag
parents a8988507 31e9dc49

fs/ext2/super.c

+5 −1
Original line number Diff line number Diff line
@@ -753,8 +753,12 @@ static loff_t ext2_max_size(int bits) 
	res += 1LL << (bits-2);

	res += 1LL << (2*(bits-2));

	res += 1LL << (3*(bits-2));

	/* Compute how many metadata blocks are needed */

	meta_blocks = 1;

	meta_blocks += 1 + ppb;

	meta_blocks += 1 + ppb + ppb * ppb;

	/* Does block tree limit file size? */

	if (res < upper_limit)

	if (res + meta_blocks <= upper_limit)

		goto check_lfs;



	res = upper_limit;

fs/reiserfs/Kconfig

+7 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config REISERFS_FS

	tristate "Reiserfs support"

	tristate "Reiserfs support (deprecated)"

	select CRC32

	help

	  Stores not just filenames but the files themselves in a balanced

	  tree.  Uses journalling.

	  Reiserfs is deprecated and scheduled to be removed from the kernel

	  in 2025. If you are still using it, please migrate to another

	  filesystem or tell us your usecase for reiserfs.



	  Reiserfs stores not just filenames but the files themselves in a

	  balanced tree.  Uses journalling.



	  Balanced trees are more efficient than traditional file system

	  architectural foundations.

fs/reiserfs/inode.c

+5 −11
Original line number Diff line number Diff line
@@ -2763,13 +2763,6 @@ static int reiserfs_write_begin(struct file *file, 
	int old_ref = 0;



 	inode = mapping->host;

	*fsdata = NULL;

 	if (flags & AOP_FLAG_CONT_EXPAND &&

 	    (pos & (inode->i_sb->s_blocksize - 1)) == 0) {

 		pos ++;

		*fsdata = (void *)(unsigned long)flags;

	}



	index = pos >> PAGE_SHIFT;

	page = grab_cache_page_write_begin(mapping, index, flags);

	if (!page)
@@ -2896,9 +2889,6 @@ static int reiserfs_write_end(struct file *file, struct address_space *mapping, 
	unsigned start;

	bool locked = false;



	if ((unsigned long)fsdata & AOP_FLAG_CONT_EXPAND)

		pos ++;



	reiserfs_wait_on_write_block(inode->i_sb);

	if (reiserfs_transaction_running(inode->i_sb))

		th = current->journal_info;
@@ -3316,7 +3306,11 @@ int reiserfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, 


		/* fill in hole pointers in the expanding truncate case. */

		if (attr->ia_size > inode->i_size) {

			error = generic_cont_expand_simple(inode, attr->ia_size);

			loff_t pos = attr->ia_size;



			if ((pos & (inode->i_sb->s_blocksize - 1)) == 0)

				pos++;

			error = generic_cont_expand_simple(inode, pos);

			if (REISERFS_I(inode)->i_prealloc_count > 0) {

				int err;

				struct reiserfs_transaction_handle th;

fs/reiserfs/super.c

+2 −0
Original line number Diff line number Diff line
@@ -1652,6 +1652,8 @@ static int read_super_block(struct super_block *s, int offset) 
		return 1;

	}



	reiserfs_warning(NULL, "", "reiserfs filesystem is deprecated and "

		"scheduled to be removed from the kernel in 2025");

	SB_BUFFER_WITH_SB(s) = bh;

	SB_DISK_SUPER_BLOCK(s) = rs;

fs/udf/super.c

+1 −2
Original line number Diff line number Diff line
@@ -2474,7 +2474,6 @@ static unsigned int udf_count_free_table(struct super_block *sb, 
	unsigned int accum = 0;

	uint32_t elen;

	struct kernel_lb_addr eloc;

	int8_t etype;

	struct extent_position epos;



	mutex_lock(&UDF_SB(sb)->s_alloc_mutex);
@@ -2482,7 +2481,7 @@ static unsigned int udf_count_free_table(struct super_block *sb, 
	epos.offset = sizeof(struct unallocSpaceEntry);

	epos.bh = NULL;



	while ((etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1)

	while (udf_next_aext(table, &epos, &eloc, &elen, 1) != -1)

		accum += (elen >> table->i_sb->s_blocksize_bits);



	brelse(epos.bh);