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

Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs updates from Al Viro:
 "misc pile"

* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: sysv: Fix sysv_nblocks() returns wrong value
  get rid of INT_LIMIT, use type_max() instead
  btrfs: replace INT_LIMIT(loff_t) with OFFSET_MAX
  fs: simplify vfs_get_super
  fs: drop useless condition from inode_needs_update_time
parents 13c574fe e0c49bd2

Documentation/filesystems/mount_api.rst

+0 −11
Original line number Diff line number Diff line
@@ -562,17 +562,6 @@ or looking up of superblocks. 


The following helpers all wrap sget_fc():



   * ::



       int vfs_get_super(struct fs_context *fc,

		         enum vfs_get_super_keying keying,

		         int (*fill_super)(struct super_block *sb,

					   struct fs_context *fc))



     This creates/looks up a deviceless superblock.  The keying indicates how

     many superblocks of this type may exist and in what manner they may be

     shared:



	(1) vfs_get_single_super



	    Only one such superblock may exist in the system.  Any further

fs/btrfs/ordered-data.c

+3 −3
Original line number Diff line number Diff line
@@ -761,11 +761,11 @@ int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len) 
	struct btrfs_ordered_extent *ordered;



	if (start + len < start) {

		orig_end = INT_LIMIT(loff_t);

		orig_end = OFFSET_MAX;

	} else {

		orig_end = start + len - 1;

		if (orig_end > INT_LIMIT(loff_t))

			orig_end = INT_LIMIT(loff_t);

		if (orig_end > OFFSET_MAX)

			orig_end = OFFSET_MAX;

	}



	/* start IO across the range first to instantiate any delalloc

fs/inode.c

+0 −3
Original line number Diff line number Diff line
@@ -2071,9 +2071,6 @@ static int inode_needs_update_time(struct inode *inode, struct timespec64 *now) 
	if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode))

		sync_it |= S_VERSION;



	if (!sync_it)

		return 0;



	return sync_it;

}

fs/super.c

+9 −51
Original line number Diff line number Diff line
@@ -1112,55 +1112,14 @@ static int test_single_super(struct super_block *s, struct fs_context *fc) 
	return 1;

}



/**

 * vfs_get_super - Get a superblock with a search key set in s_fs_info.

 * @fc: The filesystem context holding the parameters

 * @keying: How to distinguish superblocks

 * @fill_super: Helper to initialise a new superblock

 *

 * Search for a superblock and create a new one if not found.  The search

 * criterion is controlled by @keying.  If the search fails, a new superblock

 * is created and @fill_super() is called to initialise it.

 *

 * @keying can take one of a number of values:

 *

 * (1) vfs_get_single_super - Only one superblock of this type may exist on the

 *     system.  This is typically used for special system filesystems.

 *

 * (2) vfs_get_keyed_super - Multiple superblocks may exist, but they must have

 *     distinct keys (where the key is in s_fs_info).  Searching for the same

 *     key again will turn up the superblock for that key.

 *

 * (3) vfs_get_independent_super - Multiple superblocks may exist and are

 *     unkeyed.  Each call will get a new superblock.

 *

 * A permissions check is made by sget_fc() unless we're getting a superblock

 * for a kernel-internal mount or a submount.

 */

int vfs_get_super(struct fs_context *fc,

		  enum vfs_get_super_keying keying,

static int vfs_get_super(struct fs_context *fc, bool reconf,

		int (*test)(struct super_block *, struct fs_context *),

		int (*fill_super)(struct super_block *sb,

				  struct fs_context *fc))

{

	int (*test)(struct super_block *, struct fs_context *);

	struct super_block *sb;

	int err;



	switch (keying) {

	case vfs_get_single_super:

	case vfs_get_single_reconf_super:

		test = test_single_super;

		break;

	case vfs_get_keyed_super:

		test = test_keyed_super;

		break;

	case vfs_get_independent_super:

		test = NULL;

		break;

	default:

		BUG();

	}



	sb = sget_fc(fc, test, set_anon_super_fc);

	if (IS_ERR(sb))

		return PTR_ERR(sb);
@@ -1174,7 +1133,7 @@ int vfs_get_super(struct fs_context *fc, 
		fc->root = dget(sb->s_root);

	} else {

		fc->root = dget(sb->s_root);

		if (keying == vfs_get_single_reconf_super) {

		if (reconf) {

			err = reconfigure_super(fc);

			if (err < 0) {

				dput(fc->root);
@@ -1190,13 +1149,12 @@ int vfs_get_super(struct fs_context *fc, 
	deactivate_locked_super(sb);

	return err;

}

EXPORT_SYMBOL(vfs_get_super);



int get_tree_nodev(struct fs_context *fc,

		  int (*fill_super)(struct super_block *sb,

				    struct fs_context *fc))

{

	return vfs_get_super(fc, vfs_get_independent_super, fill_super);

	return vfs_get_super(fc, false, NULL, fill_super);

}

EXPORT_SYMBOL(get_tree_nodev);
@@ -1204,7 +1162,7 @@ int get_tree_single(struct fs_context *fc, 
		  int (*fill_super)(struct super_block *sb,

				    struct fs_context *fc))

{

	return vfs_get_super(fc, vfs_get_single_super, fill_super);

	return vfs_get_super(fc, false, test_single_super, fill_super);

}

EXPORT_SYMBOL(get_tree_single);
@@ -1212,7 +1170,7 @@ int get_tree_single_reconf(struct fs_context *fc, 
		  int (*fill_super)(struct super_block *sb,

				    struct fs_context *fc))

{

	return vfs_get_super(fc, vfs_get_single_reconf_super, fill_super);

	return vfs_get_super(fc, true, test_single_super, fill_super);

}

EXPORT_SYMBOL(get_tree_single_reconf);
@@ -1222,7 +1180,7 @@ int get_tree_keyed(struct fs_context *fc, 
		void *key)

{

	fc->s_fs_info = key;

	return vfs_get_super(fc, vfs_get_keyed_super, fill_super);

	return vfs_get_super(fc, false, test_keyed_super, fill_super);

}

EXPORT_SYMBOL(get_tree_keyed);

fs/sysv/itree.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static unsigned sysv_nblocks(struct super_block *s, loff_t size) 
		res += blocks;

		direct = 1;

	}

	return blocks;

	return res;

}



int sysv_getattr(struct user_namespace *mnt_userns, const struct path *path,