Commit 7ddd16e0 authored by Hugh Dickins's avatar Hugh Dickins Committed by Liu Shixin
Browse files

shmem: trivial tidyups, removing extra blank lines, etc 

mainline inclusion
from mainline-v6.7-rc1
commit 9be7d5b06648b808989e99c5d0bea1be47c5a384
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAIHPC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9be7d5b06648b808989e99c5d0bea1be47c5a384

--------------------------------

Mostly removing a few superfluous blank lines, joining short arglines,
imposing some 80-column observance, correcting a couple of comments.  None
of it more interesting than deleting a repeated INIT_LIST_HEAD().

Link: https://lkml.kernel.org/r/b3983d28-5d3f-8649-36af-b819285d7a9e@google.com


Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Carlos Maiolino <cem@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Darrick J. Wong <djwong@kernel.org>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Tim Chen <tim.c.chen@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent 82b3e457

mm/shmem.c

+21 −35
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, 
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



/*

 * Like filemap_add_folio, but error if expected item has gone.

 * Somewhat like filemap_add_folio, but error if expected item has gone.

 */

static int shmem_add_to_page_cache(struct folio *folio,

				   struct address_space *mapping,
@@ -832,7 +832,7 @@ static int shmem_add_to_page_cache(struct folio *folio, 
}



/*

 * Like delete_from_page_cache, but substitutes swap for @folio.

 * Somewhat like filemap_remove_folio, but substitutes swap for @folio.

 */

static void shmem_delete_from_page_cache(struct folio *folio, void *radswap)

{
@@ -895,7 +895,6 @@ unsigned long shmem_partial_swap_usage(struct address_space *mapping, 
			cond_resched_rcu();

		}

	}



	rcu_read_unlock();



	return swapped << PAGE_SHIFT;
@@ -1238,7 +1237,6 @@ static int shmem_setattr(struct mnt_idmap *idmap, 
	if (i_uid_needs_update(idmap, attr, inode) ||

	    i_gid_needs_update(idmap, attr, inode)) {

		error = dquot_transfer(idmap, inode, attr);



		if (error)

			return error;

	}
@@ -2489,7 +2487,6 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap, 
	if (err)

		return ERR_PTR(err);





	inode = new_inode(sb);

	if (!inode) {

		shmem_free_inode(sb, 0);
@@ -2514,11 +2511,10 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap, 
		shmem_set_inode_flags(inode, info->fsflags);

	INIT_LIST_HEAD(&info->shrinklist);

	INIT_LIST_HEAD(&info->swaplist);

	INIT_LIST_HEAD(&info->swaplist);

	if (sbinfo->noswap)

		mapping_set_unevictable(inode->i_mapping);

	simple_xattrs_init(&info->xattrs);

	cache_no_acl(inode);

	if (sbinfo->noswap)

		mapping_set_unevictable(inode->i_mapping);

	mapping_set_large_folios(inode->i_mapping);



	switch (mode & S_IFMT) {
@@ -2730,7 +2726,6 @@ shmem_write_begin(struct file *file, struct address_space *mapping, 
	}



	ret = shmem_get_folio(inode, index, &folio, SGP_WRITE);



	if (ret)

		return ret;
@@ -3262,8 +3257,7 @@ shmem_mknod(struct mnt_idmap *idmap, struct inode *dir, 
	error = simple_acl_create(dir, inode);

	if (error)

		goto out_iput;

	error = security_inode_init_security(inode, dir,

					     &dentry->d_name,

	error = security_inode_init_security(inode, dir, &dentry->d_name,

					     shmem_initxattrs, NULL);

	if (error && error != -EOPNOTSUPP)

		goto out_iput;
@@ -3292,14 +3286,11 @@ shmem_tmpfile(struct mnt_idmap *idmap, struct inode *dir, 
	int error;



	inode = shmem_get_inode(idmap, dir->i_sb, dir, mode, 0, VM_NORESERVE);



	if (IS_ERR(inode)) {

		error = PTR_ERR(inode);

		goto err_out;

	}



	error = security_inode_init_security(inode, dir,

					     NULL,

	error = security_inode_init_security(inode, dir, NULL,

					     shmem_initxattrs, NULL);

	if (error && error != -EOPNOTSUPP)

		goto out_iput;
@@ -3336,7 +3327,8 @@ static int shmem_create(struct mnt_idmap *idmap, struct inode *dir, 
/*

 * Link a file..

 */

static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)

static int shmem_link(struct dentry *old_dentry, struct inode *dir,

		      struct dentry *dentry)

{

	struct inode *inode = d_inode(old_dentry);

	int ret = 0;
@@ -3387,7 +3379,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry) 
					     inode_set_ctime_current(inode));

	inode_inc_iversion(dir);

	drop_nlink(inode);

	dput(dentry);	/* Undo the count from "create" - this does all the work */

	dput(dentry);	/* Undo the count from "create" - does all the work */

	return 0;

}
@@ -3497,7 +3489,6 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir, 


	inode = shmem_get_inode(idmap, dir->i_sb, dir, S_IFLNK | 0777, 0,

				VM_NORESERVE);



	if (IS_ERR(inode))

		return PTR_ERR(inode);
@@ -3551,8 +3542,7 @@ static void shmem_put_link(void *arg) 
	folio_put(arg);

}



static const char *shmem_get_link(struct dentry *dentry,

				  struct inode *inode,

static const char *shmem_get_link(struct dentry *dentry, struct inode *inode,

				  struct delayed_call *done)

{

	struct folio *folio = NULL;
@@ -3626,8 +3616,7 @@ static int shmem_fileattr_set(struct mnt_idmap *idmap, 
 * Callback for security_inode_init_security() for acquiring xattrs.

 */

static int shmem_initxattrs(struct inode *inode,

			    const struct xattr *xattr_array,

			    void *fs_info)

			    const struct xattr *xattr_array, void *fs_info)

{

	struct shmem_inode_info *info = SHMEM_I(inode);

	struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);
@@ -3811,7 +3800,6 @@ static struct dentry *shmem_find_alias(struct inode *inode) 
	return alias ?: d_find_any_alias(inode);

}





static struct dentry *shmem_fh_to_dentry(struct super_block *sb,

		struct fid *fid, int fh_len, int fh_type)

{
@@ -4395,8 +4383,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) 
	}

#endif /* CONFIG_TMPFS_QUOTA */



	inode = shmem_get_inode(&nop_mnt_idmap, sb, NULL, S_IFDIR | sbinfo->mode, 0,

				VM_NORESERVE);

	inode = shmem_get_inode(&nop_mnt_idmap, sb, NULL,

				S_IFDIR | sbinfo->mode, 0, VM_NORESERVE);

	if (IS_ERR(inode)) {

		error = PTR_ERR(inode);

		goto failed;
@@ -4703,10 +4691,8 @@ static ssize_t shmem_enabled_show(struct kobject *kobj, 
	for (i = 0; i < ARRAY_SIZE(values); i++) {

		len += sysfs_emit_at(buf, len,

				shmem_huge == values[i] ? "%s[%s]" : "%s%s",

				     i ? " " : "",

				     shmem_format_huge(values[i]));

				i ? " " : "", shmem_format_huge(values[i]));

	}



	len += sysfs_emit_at(buf, len, "\n");



	return len;
@@ -4803,7 +4789,8 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); 
#define shmem_acct_size(flags, size)		0

#define shmem_unacct_size(flags, size)		do {} while (0)



static inline struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block *sb, struct inode *dir,

static inline struct inode *shmem_get_inode(struct mnt_idmap *idmap,

				struct super_block *sb, struct inode *dir,

				umode_t mode, dev_t dev, unsigned long flags)

{

	struct inode *inode = ramfs_get_inode(sb, dir, mode, dev);
@@ -4814,8 +4801,8 @@ static inline struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct supe 


/* common code */



static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, loff_t size,

				       unsigned long flags, unsigned int i_flags)

static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name,

			loff_t size, unsigned long flags, unsigned int i_flags)

{

	struct inode *inode;

	struct file *res;
@@ -4834,7 +4821,6 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, l 


	inode = shmem_get_inode(&nop_mnt_idmap, mnt->mnt_sb, NULL,

				S_IFREG | S_IRWXUGO, 0, flags);



	if (IS_ERR(inode)) {

		shmem_unacct_size(flags, size);

		return ERR_CAST(inode);