From: Christian Brauner <brauner@kernel.org>
Date: Fri, 21 Feb 2025 13:16:27 +0000 (+0100)
Subject: Merge branch 'vfs-6.15.mount' into vfs.all
X-Git-Tag: next-20250224~122^2~1^2~10
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=54c0937d323c45b39b4907f5df52d25650f10cc8;p=linux%2F.git

Merge branch 'vfs-6.15.mount' into vfs.all
---

54c0937d323c45b39b4907f5df52d25650f10cc8
diff --cc fs/internal.h
index 1cb85a62c07f,db6094d5cb0b..3d05a989e4fa
--- a/fs/internal.h
+++ b/fs/internal.h
@@@ -338,4 -338,4 +338,5 @@@ static inline bool path_mounted(const s
  	return path->mnt->mnt_root == path->dentry;
  }
  void file_f_owner_release(struct file *file);
 +bool file_seek_cur_needs_f_lock(struct file *file);
+ int statmount_mnt_idmap(struct mnt_idmap *idmap, struct seq_file *seq, bool uid_map);
diff --cc fs/namespace.c
index 8f1000f9f3df,01fb1074c4c9..ee97f82c52bb
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@@ -5228,9 -5424,17 +5429,17 @@@ static int statmount_string(struct ksta
  		statmount_fs_subtype(s, seq);
  		break;
  	case STATMOUNT_SB_SOURCE:
 -		sm->sb_source = start;
 +		offp = &sm->sb_source;
  		ret = statmount_sb_source(s, seq);
  		break;
+ 	case STATMOUNT_MNT_UIDMAP:
+ 		sm->mnt_uidmap = start;
+ 		ret = statmount_mnt_uidmap(s, seq);
+ 		break;
+ 	case STATMOUNT_MNT_GIDMAP:
+ 		sm->mnt_gidmap = start;
+ 		ret = statmount_mnt_gidmap(s, seq);
+ 		break;
  	default:
  		WARN_ON_ONCE(true);
  		return -EINVAL;