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

Merge tag 'fs.idmapped.docs.v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux 

Pull fs helper kernel-doc updates from Christian Brauner:
 "In the last cycles we forgot to update the kernel-docs in some places
  that were changed during the idmapped mount work. Lukas and Randy took
  the chance to not just fixup those places but also fixup and expand
  kernel-docs for some additional helpers.

  No functional changes"

* tag 'fs.idmapped.docs.v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  fs: update kernel-doc for vfs_rename()
  fs: turn some comments into kernel-doc
  xattr: fix kernel-doc for mnt_userns and vfs xattr helpers
  namei: fix kernel-doc for struct renamedata and more
  libfs: fix kernel-doc for mnt_userns
parents b34b95eb 92cb01c7

fs/libfs.c

+1 −0
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ EXPORT_SYMBOL(simple_rename); 


/**

 * simple_setattr - setattr for simple filesystem

 * @mnt_userns: user namespace of the target mount

 * @dentry: dentry

 * @iattr: iattr structure

 *

fs/namei.c

+3 −11
Original line number Diff line number Diff line
@@ -1126,8 +1126,7 @@ int may_linkat(struct user_namespace *mnt_userns, struct path *link) 
 *			  should be allowed, or not, on files that already

 *			  exist.

 * @mnt_userns:	user namespace of the mount the inode was found from

 * @dir_mode: mode bits of directory

 * @dir_uid: owner of directory

 * @nd: nameidata pathwalk data

 * @inode: the inode of the file to open

 *

 * Block an O_CREAT open of a FIFO (or a regular file) when:
@@ -3383,7 +3382,7 @@ static int do_open(struct nameidata *nd, 
 * @mnt_userns:	user namespace of the mount the inode was found from

 * @dentry:	pointer to dentry of the base directory

 * @mode:	mode of the new tmpfile

 * @open_flags:	flags

 * @open_flag:	flags

 *

 * Create a temporary file.

 *
@@ -4408,14 +4407,7 @@ SYSCALL_DEFINE2(link, const char __user *, oldname, const char __user *, newname 


/**

 * vfs_rename - rename a filesystem object

 * @old_mnt_userns:	old user namespace of the mount the inode was found from

 * @old_dir:		parent of source

 * @old_dentry:		source

 * @new_mnt_userns:	new user namespace of the mount the inode was found from

 * @new_dir:		parent of destination

 * @new_dentry:		destination

 * @delegated_inode:	returns an inode needing a delegation break

 * @flags:		rename flags

 * @rd:		pointer to &struct renamedata info

 *

 * The caller must hold multiple mutexes--see lock_rename()).

 *

fs/xattr.c

+8 −6
Original line number Diff line number Diff line
@@ -186,12 +186,12 @@ EXPORT_SYMBOL(__vfs_setxattr); 
 *  __vfs_setxattr_noperm - perform setxattr operation without performing

 *  permission checks.

 *

 *  @mnt_userns - user namespace of the mount the inode was found from

 *  @dentry - object to perform setxattr on

 *  @name - xattr name to set

 *  @value - value to set @name to

 *  @size - size of @value

 *  @flags - flags to pass into filesystem operations

 *  @mnt_userns: user namespace of the mount the inode was found from

 *  @dentry: object to perform setxattr on

 *  @name: xattr name to set

 *  @value: value to set @name to

 *  @size: size of @value

 *  @flags: flags to pass into filesystem operations

 *

 *  returns the result of the internal setxattr or setsecurity operations.

 *
@@ -242,6 +242,7 @@ int __vfs_setxattr_noperm(struct user_namespace *mnt_userns, 
 * __vfs_setxattr_locked - set an extended attribute while holding the inode

 * lock

 *

 *  @mnt_userns: user namespace of the mount of the target inode

 *  @dentry: object to perform setxattr on

 *  @name: xattr name to set

 *  @value: value to set @name to
@@ -473,6 +474,7 @@ EXPORT_SYMBOL(__vfs_removexattr); 
 * __vfs_removexattr_locked - set an extended attribute while holding the inode

 * lock

 *

 *  @mnt_userns: user namespace of the mount of the target inode

 *  @dentry: object to perform setxattr on

 *  @name: name of xattr to remove

 *  @delegated_inode: on return, will contain an inode pointer that

include/linux/fs.h

+14 −3
Original line number Diff line number Diff line
@@ -1740,7 +1740,7 @@ static inline void sb_start_pagefault(struct super_block *sb) 
	__sb_start_write(sb, SB_FREEZE_PAGEFAULT);

}



/*

/**

 * sb_start_intwrite - get write access to a superblock for internal fs purposes

 * @sb: the super we write to

 *
@@ -1783,6 +1783,17 @@ int vfs_rmdir(struct user_namespace *, struct inode *, struct dentry *); 
int vfs_unlink(struct user_namespace *, struct inode *, struct dentry *,

	       struct inode **);



/**

 * struct renamedata - contains all information required for renaming

 * @old_mnt_userns:    old user namespace of the mount the inode was found from

 * @old_dir:           parent of source

 * @old_dentry:                source

 * @new_mnt_userns:    new user namespace of the mount the inode was found from

 * @new_dir:           parent of destination

 * @new_dentry:                destination

 * @delegated_inode:   returns an inode needing a delegation break

 * @flags:             rename flags

 */

struct renamedata {

	struct user_namespace *old_mnt_userns;

	struct inode *old_dir;
@@ -3170,7 +3181,7 @@ static inline ssize_t blockdev_direct_IO(struct kiocb *iocb, 


void inode_dio_wait(struct inode *inode);



/*

/**

 * inode_dio_begin - signal start of a direct I/O requests

 * @inode: inode the direct I/O happens on

 *
@@ -3182,7 +3193,7 @@ static inline void inode_dio_begin(struct inode *inode) 
	atomic_inc(&inode->i_dio_count);

}



/*

/**

 * inode_dio_end - signal finish of a direct I/O requests

 * @inode: inode the direct I/O happens on

 *