Do the replacement:
s/simply passs @nop_mnt_idmap/simply passs @nop_mnt_idmap/
in the fs/ tree.
Found by chance while working on support for idmapped mounts in fuse.
Cc: Jan Kara <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Christian Brauner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
---
fs/attr.c | 2 +-
fs/inode.c | 2 +-
fs/namei.c | 22 +++++++++++-----------
fs/posix_acl.c | 4 ++--
fs/stat.c | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/fs/attr.c b/fs/attr.c
index bdf5deb06ea9..5a13f0c8495f 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -157,7 +157,7 @@ static bool chgrp_ok(struct mnt_idmap *idmap,
* the vfsmount must be passed through @idmap. This function will then
* take care to map the inode according to @idmap before checking
* permissions. On non-idmapped mounts or if permission checking is to be
- * performed on the raw inode simply passs @nop_mnt_idmap.
+ * performed on the raw inode simply pass @nop_mnt_idmap.
*
* Should be called as the first thing in ->setattr implementations,
* possibly after taking additional locks.
diff --git a/fs/inode.c b/fs/inode.c
index edcd8a61975f..60d0667cbd27 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2402,7 +2402,7 @@ EXPORT_SYMBOL(inode_init_owner);
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
bool inode_owner_or_capable(struct mnt_idmap *idmap,
const struct inode *inode)
diff --git a/fs/namei.c b/fs/namei.c
index 71c13b2990b4..200eb919cdc0 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -289,7 +289,7 @@ EXPORT_SYMBOL(putname);
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
static int check_acl(struct mnt_idmap *idmap,
struct inode *inode, int mask)
@@ -334,7 +334,7 @@ static int check_acl(struct mnt_idmap *idmap,
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
static int acl_permission_check(struct mnt_idmap *idmap,
struct inode *inode, int mask)
@@ -395,7 +395,7 @@ static int acl_permission_check(struct mnt_idmap *idmap,
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
int generic_permission(struct mnt_idmap *idmap, struct inode *inode,
int mask)
@@ -3158,7 +3158,7 @@ static inline umode_t vfs_prepare_mode(struct mnt_idmap *idmap,
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
int vfs_create(struct mnt_idmap *idmap, struct inode *dir,
struct dentry *dentry, umode_t mode, bool want_excl)
@@ -3646,7 +3646,7 @@ static int do_open(struct nameidata *nd,
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
static int vfs_tmpfile(struct mnt_idmap *idmap,
const struct path *parentpath,
@@ -3954,7 +3954,7 @@ EXPORT_SYMBOL(user_path_create);
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
int vfs_mknod(struct mnt_idmap *idmap, struct inode *dir,
struct dentry *dentry, umode_t mode, dev_t dev)
@@ -4080,7 +4080,7 @@ SYSCALL_DEFINE3(mknod, const char __user *, filename, umode_t, mode, unsigned, d
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
int vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
struct dentry *dentry, umode_t mode)
@@ -4161,7 +4161,7 @@ SYSCALL_DEFINE2(mkdir, const char __user *, pathname, umode_t, mode)
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
int vfs_rmdir(struct mnt_idmap *idmap, struct inode *dir,
struct dentry *dentry)
@@ -4290,7 +4290,7 @@ SYSCALL_DEFINE1(rmdir, const char __user *, pathname)
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
int vfs_unlink(struct mnt_idmap *idmap, struct inode *dir,
struct dentry *dentry, struct inode **delegated_inode)
@@ -4443,7 +4443,7 @@ SYSCALL_DEFINE1(unlink, const char __user *, pathname)
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
int vfs_symlink(struct mnt_idmap *idmap, struct inode *dir,
struct dentry *dentry, const char *oldname)
@@ -4535,7 +4535,7 @@ SYSCALL_DEFINE2(symlink, const char __user *, oldname, const char __user *, newn
* the vfsmount must be passed through @idmap. This function will then take
* care to map the inode according to @idmap before checking permissions.
* On non-idmapped mounts or if permission checking is to be performed on the
- * raw inode simply passs @nop_mnt_idmap.
+ * raw inode simply pass @nop_mnt_idmap.
*/
int vfs_link(struct dentry *old_dentry, struct mnt_idmap *idmap,
struct inode *dir, struct dentry *new_dentry,
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index a05fe94970ce..e1af20893ebe 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -600,7 +600,7 @@ EXPORT_SYMBOL(__posix_acl_chmod);
* the vfsmount must be passed through @idmap. This function will then
* take care to map the inode according to @idmap before checking
* permissions. On non-idmapped mounts or if permission checking is to be
- * performed on the raw inode simply passs @nop_mnt_idmap.
+ * performed on the raw inode simply pass @nop_mnt_idmap.
*/
int
posix_acl_chmod(struct mnt_idmap *idmap, struct dentry *dentry,
@@ -700,7 +700,7 @@ EXPORT_SYMBOL_GPL(posix_acl_create);
* the vfsmount must be passed through @idmap. This function will then
* take care to map the inode according to @idmap before checking
* permissions. On non-idmapped mounts or if permission checking is to be
- * performed on the raw inode simply passs @nop_mnt_idmap.
+ * performed on the raw inode simply pass @nop_mnt_idmap.
*
* Called from set_acl inode operations.
*/
diff --git a/fs/stat.c b/fs/stat.c
index 24bb0209e459..0ab525f80a49 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -41,7 +41,7 @@
* the vfsmount must be passed through @idmap. This function will then
* take care to map the inode according to @idmap before filling in the
* uid and gid filds. On non-idmapped mounts or if permission checking is to be
- * performed on the raw inode simply passs @nop_mnt_idmap.
+ * performed on the raw inode simply pass @nop_mnt_idmap.
*/
void generic_fillattr(struct mnt_idmap *idmap, u32 request_mask,
struct inode *inode, struct kstat *stat)
--
2.34.1
On Fri 15-12-23 14:09:27, Alexander Mikhalitsyn wrote:
> Do the replacement:
> s/simply passs @nop_mnt_idmap/simply passs @nop_mnt_idmap/
> in the fs/ tree.
>
> Found by chance while working on support for idmapped mounts in fuse.
>
> Cc: Jan Kara <[email protected]>
> Cc: Alexander Viro <[email protected]>
> Cc: Christian Brauner <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Alexander Mikhalitsyn <[email protected]>
Sure, thanks! Feel free to add:
Reviewed-by: Jan Kara <[email protected]>
Honza
> ---
> fs/attr.c | 2 +-
> fs/inode.c | 2 +-
> fs/namei.c | 22 +++++++++++-----------
> fs/posix_acl.c | 4 ++--
> fs/stat.c | 2 +-
> 5 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/fs/attr.c b/fs/attr.c
> index bdf5deb06ea9..5a13f0c8495f 100644
> --- a/fs/attr.c
> +++ b/fs/attr.c
> @@ -157,7 +157,7 @@ static bool chgrp_ok(struct mnt_idmap *idmap,
> * the vfsmount must be passed through @idmap. This function will then
> * take care to map the inode according to @idmap before checking
> * permissions. On non-idmapped mounts or if permission checking is to be
> - * performed on the raw inode simply passs @nop_mnt_idmap.
> + * performed on the raw inode simply pass @nop_mnt_idmap.
> *
> * Should be called as the first thing in ->setattr implementations,
> * possibly after taking additional locks.
> diff --git a/fs/inode.c b/fs/inode.c
> index edcd8a61975f..60d0667cbd27 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -2402,7 +2402,7 @@ EXPORT_SYMBOL(inode_init_owner);
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> bool inode_owner_or_capable(struct mnt_idmap *idmap,
> const struct inode *inode)
> diff --git a/fs/namei.c b/fs/namei.c
> index 71c13b2990b4..200eb919cdc0 100644
> --- a/fs/namei.c
> +++ b/fs/namei.c
> @@ -289,7 +289,7 @@ EXPORT_SYMBOL(putname);
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> static int check_acl(struct mnt_idmap *idmap,
> struct inode *inode, int mask)
> @@ -334,7 +334,7 @@ static int check_acl(struct mnt_idmap *idmap,
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> static int acl_permission_check(struct mnt_idmap *idmap,
> struct inode *inode, int mask)
> @@ -395,7 +395,7 @@ static int acl_permission_check(struct mnt_idmap *idmap,
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> int generic_permission(struct mnt_idmap *idmap, struct inode *inode,
> int mask)
> @@ -3158,7 +3158,7 @@ static inline umode_t vfs_prepare_mode(struct mnt_idmap *idmap,
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> int vfs_create(struct mnt_idmap *idmap, struct inode *dir,
> struct dentry *dentry, umode_t mode, bool want_excl)
> @@ -3646,7 +3646,7 @@ static int do_open(struct nameidata *nd,
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> static int vfs_tmpfile(struct mnt_idmap *idmap,
> const struct path *parentpath,
> @@ -3954,7 +3954,7 @@ EXPORT_SYMBOL(user_path_create);
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> int vfs_mknod(struct mnt_idmap *idmap, struct inode *dir,
> struct dentry *dentry, umode_t mode, dev_t dev)
> @@ -4080,7 +4080,7 @@ SYSCALL_DEFINE3(mknod, const char __user *, filename, umode_t, mode, unsigned, d
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> int vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
> struct dentry *dentry, umode_t mode)
> @@ -4161,7 +4161,7 @@ SYSCALL_DEFINE2(mkdir, const char __user *, pathname, umode_t, mode)
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> int vfs_rmdir(struct mnt_idmap *idmap, struct inode *dir,
> struct dentry *dentry)
> @@ -4290,7 +4290,7 @@ SYSCALL_DEFINE1(rmdir, const char __user *, pathname)
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> int vfs_unlink(struct mnt_idmap *idmap, struct inode *dir,
> struct dentry *dentry, struct inode **delegated_inode)
> @@ -4443,7 +4443,7 @@ SYSCALL_DEFINE1(unlink, const char __user *, pathname)
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> int vfs_symlink(struct mnt_idmap *idmap, struct inode *dir,
> struct dentry *dentry, const char *oldname)
> @@ -4535,7 +4535,7 @@ SYSCALL_DEFINE2(symlink, const char __user *, oldname, const char __user *, newn
> * the vfsmount must be passed through @idmap. This function will then take
> * care to map the inode according to @idmap before checking permissions.
> * On non-idmapped mounts or if permission checking is to be performed on the
> - * raw inode simply passs @nop_mnt_idmap.
> + * raw inode simply pass @nop_mnt_idmap.
> */
> int vfs_link(struct dentry *old_dentry, struct mnt_idmap *idmap,
> struct inode *dir, struct dentry *new_dentry,
> diff --git a/fs/posix_acl.c b/fs/posix_acl.c
> index a05fe94970ce..e1af20893ebe 100644
> --- a/fs/posix_acl.c
> +++ b/fs/posix_acl.c
> @@ -600,7 +600,7 @@ EXPORT_SYMBOL(__posix_acl_chmod);
> * the vfsmount must be passed through @idmap. This function will then
> * take care to map the inode according to @idmap before checking
> * permissions. On non-idmapped mounts or if permission checking is to be
> - * performed on the raw inode simply passs @nop_mnt_idmap.
> + * performed on the raw inode simply pass @nop_mnt_idmap.
> */
> int
> posix_acl_chmod(struct mnt_idmap *idmap, struct dentry *dentry,
> @@ -700,7 +700,7 @@ EXPORT_SYMBOL_GPL(posix_acl_create);
> * the vfsmount must be passed through @idmap. This function will then
> * take care to map the inode according to @idmap before checking
> * permissions. On non-idmapped mounts or if permission checking is to be
> - * performed on the raw inode simply passs @nop_mnt_idmap.
> + * performed on the raw inode simply pass @nop_mnt_idmap.
> *
> * Called from set_acl inode operations.
> */
> diff --git a/fs/stat.c b/fs/stat.c
> index 24bb0209e459..0ab525f80a49 100644
> --- a/fs/stat.c
> +++ b/fs/stat.c
> @@ -41,7 +41,7 @@
> * the vfsmount must be passed through @idmap. This function will then
> * take care to map the inode according to @idmap before filling in the
> * uid and gid filds. On non-idmapped mounts or if permission checking is to be
> - * performed on the raw inode simply passs @nop_mnt_idmap.
> + * performed on the raw inode simply pass @nop_mnt_idmap.
> */
> void generic_fillattr(struct mnt_idmap *idmap, u32 request_mask,
> struct inode *inode, struct kstat *stat)
> --
> 2.34.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR
On Fri, 15 Dec 2023 14:09:27 +0100, Alexander Mikhalitsyn wrote:
> Do the replacement:
> s/simply passs @nop_mnt_idmap/simply passs @nop_mnt_idmap/
> in the fs/ tree.
>
> Found by chance while working on support for idmapped mounts in fuse.
>
>
> [...]
Applied to the vfs.misc branch of the vfs/vfs.git tree.
Patches in the vfs.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.misc
[1/1] fs: fix doc comment typo fs tree wide
https://git.kernel.org/vfs/vfs/c/beb158fd2708
On Fri, Dec 15, 2023 at 02:09:27PM +0100, Alexander Mikhalitsyn wrote:
> Do the replacement:
> s/simply passs @nop_mnt_idmap/simply passs @nop_mnt_idmap/
^^^ ^^^
> in the fs/ tree.
You might want to spell it correctly in the replacement string ;-)
On Mon, Dec 18, 2023 at 11:18:59PM +0000, Al Viro wrote:
> On Fri, Dec 15, 2023 at 02:09:27PM +0100, Alexander Mikhalitsyn wrote:
> > Do the replacement:
> > s/simply passs @nop_mnt_idmap/simply passs @nop_mnt_idmap/
> ^^^ ^^^
> > in the fs/ tree.
>
> You might want to spell it correctly in the replacement string ;-)
Thanks. Fixed the commit message. :)