From patchwork Sat Sep 30 03:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13404929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 488DCE77350 for ; Sat, 30 Sep 2023 03:28:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A25938D0109; Fri, 29 Sep 2023 23:28:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D3C48D002B; Fri, 29 Sep 2023 23:28:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 874B58D0109; Fri, 29 Sep 2023 23:28:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7799F8D002B for ; Fri, 29 Sep 2023 23:28:56 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 46E074067F for ; Sat, 30 Sep 2023 03:28:56 +0000 (UTC) X-FDA: 81291832272.29.E4757AB Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) by imf22.hostedemail.com (Postfix) with ESMTP id 82290C000F for ; Sat, 30 Sep 2023 03:28:54 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=LUDWTxHd; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of hughd@google.com designates 209.85.128.169 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696044534; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/Dj6Oo+B5y8AHftgdToua+FX2M1F3oxEvkpI+qfcb0o=; b=wtfghXKuRsPuQ6JdC4g5jkz6qKh4E7sCWgRiO26jIi7FArfZznDG3WImBDiAIDAT+zvMcW yXKodsmwoSlQIo4wQzBV4gFVg+eKZUtWSh694Fs9CsEhlFWckNXCpHOYYNSxYQgF8Tv4g9 UeQXOylxXXY08v+TNil7m3Pok/P1Abo= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=LUDWTxHd; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of hughd@google.com designates 209.85.128.169 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696044534; a=rsa-sha256; cv=none; b=fML/d5pSXtF7ZXSy/oXCVF4fXXJkThQcCtxx9gj+Xfx3VT+5V8gvtJ1JfqiX9keFPal0EK plKaiTCzuNNyvQwDewFbfPFDiMjXkRhN794ydB29hKeTIv5DennX4VEICS+wiMVj4P7j9e auiLVoLGJuyKmthKlEdRPh48qxQq0N0= Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-5a2536adaf3so5378647b3.2 for ; Fri, 29 Sep 2023 20:28:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696044533; x=1696649333; darn=kvack.org; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=/Dj6Oo+B5y8AHftgdToua+FX2M1F3oxEvkpI+qfcb0o=; b=LUDWTxHd2heqYIzyu040G4+FMqGeBXRP6Kweo9yd4peRpCdDtpRPLNsLAQWVODewi7 bgsGiZyHd8WqOVUMHpi2ZxqKZ0CJ8xLp/U25z7zVRN1FpQQAjq+f9UyB2fDK9NM4i+/M wKv3Z+DzZ7khwa2rInxM/7FQLJ7Y8d8L9fZlHv4R5IKG5AKz9Fgo/1eCFuGl4g2LyH2t T/HTTVh0/ZQe58DfN5jU8P/02UYO206sObEzh4cePU14fWoK6YRYXWLJmi3IIy6OehFM c+CFajMpyU22cFgG2PBU/fKqXyyJl4fjDOVrkqM94luWEiK1AKwfwYETxBP+JMDux8uR yxsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696044533; x=1696649333; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/Dj6Oo+B5y8AHftgdToua+FX2M1F3oxEvkpI+qfcb0o=; b=vntHqblVMdnMOLeFC7FHOHM55EeVy+TJc5MTGJ0cd/de6dafLW72uRAPA5Assk4T8K hNJ8wIA8txgSvfz/ZXypWeVWtOQXgGSrU8H0B/fPD8LmJCvcWbzqiKOfJvKEPIE/fyq+ Obxpgx7SJj9XqnKTu1ONMLmUuEAKLHbMHQ8eC/cXO+l46FVW46Qo+hgJgv+uKdGnBSuv TnU5NeLCGF8Q5vMz4i4qc2pzwgSaTKhcT5gRceIofMyyELgFR62PL63EQ67COfJw5l51 /Muo9puSDbk5Z2oCjHjfoVaZkzLhTf8CLONVnYIgx7qK3MxWSXiTd0iD2s8wD7x7+yFx SnuA== X-Gm-Message-State: AOJu0YyJg1p/BF3ZZK/X1AHNTcbzjHCT98F0eJy+le6OKDow9GScWaGJ RpTfsvGSM9fjbpSGFD/4bn1T0w== X-Google-Smtp-Source: AGHT+IHPj4w9oZpttkU3FSY37D6TH9BiRNUeI9NUbTwdclt9Ncz+8LjmVJX7PwjhqGcgK9q2b2JpVA== X-Received: by 2002:a0d:df45:0:b0:595:9770:6914 with SMTP id i66-20020a0ddf45000000b0059597706914mr6356530ywe.35.1696044533585; Fri, 29 Sep 2023 20:28:53 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id s185-20020a8182c2000000b00597e912e67esm6008532ywf.131.2023.09.29.20.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 20:28:52 -0700 (PDT) Date: Fri, 29 Sep 2023 20:28:50 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: Christian Brauner , Carlos Maiolino , Chuck Lever , Jan Kara , Matthew Wilcox , Johannes Weiner , Axel Rasmussen , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/8] shmem: trivial tidyups, removing extra blank lines, etc In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 82290C000F X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: u1bm73dzftfon6mum38kqs9uwxc4yfcu X-HE-Tag: 1696044534-410198 X-HE-Meta: U2FsdGVkX18q629U9tB01y55F5N6JyV/x6kg4F6rU0VM7y8uH9DRCp2JnItzfrCBcKb+pUtzlmi5IIne1C8wVpcaxHuzVwazGUX8elnTJzwNmkb2XquXPuWWZftiiMDjOucLcezquw13U5m8Kr3ScfbOu2vlQjoJ0LjSJPYke0fs/gXzXjQEW/Ou9gdN1J3LPCq1HzM+Km3tQS5kuGUJRlwc88mhK5JeF5J6l5rJBc7F/GMFNFaZxUKit0JWxEwf1c3yj0MftoB555rodlntYCfSqeyubt/ppP3hzqL1HkJDEmwZoWt0O0gRXkwmpcrtKb56xVG/NR0mrXU4hn0k//Zkq4O5tJ7R8aj1gUHvv2Fx6oKVFvTZPPDioKH6hsbyWKik7aJXAX/M9gK2Wf4g1wiwoImp4FPN25it7tXl5CQhubsXsDRQUW9jhH11jFrVa7kl9SpXShKdJNAATa8nj0fpug9teQvwGlqPQyiHqT5JYUs/ILPwzhV2BXtEhbdOs6Vf8vd7JVoVJvnVlbhTMY/5nTbihqvG3oMoo/ZRV1Ipm6g64nxoAHtPCSUIGTj82UMG5vswEqX2K6NOZRylLLgF1Nx3iVms2/Rbzxk6AHbiWZOY2GhGfSYk+IZKswEgLKn6aYb688388gFz/ch3qSrwdNxwR87e9OBjIABJ5WniyQTD+0OLtshNtaNVSWZCIw/JLvkWXcqyjIl0vJY0yAbmeVftnBounSzPsG9//8KZHXTaFPwR0McBqg5clVrZ6BYwyLDPwmaRIv26GRre7zDzFe6DDo9VDKALunwGcwQJC4cEWc/K1p7S+TmqQRnMQjb0uicLZokDvsiVHdTDFA0i04BbNQCfexvqlJJHthEAYSOZ9AnlAel0f91hiNF8bTXAyiK0SzG29d8baZouCxljHJNlwyNY29f/+loGcn1MmDQwDuPvYCKSwYHMjekYGCzEx3obWKB0VCa1Eyd oSB9rbD1 tG3DuHlI3NBE3kX0sLN8zULYz40YdGJngmKZBfm7mhIOHWJAf//OPNGmkJR0rW6sf4bCRfluNzFrytOXR6s6XamIixfpVh9oJv0XLWtP8bblC0993CvMwY4VVrUokxq2GZctb6O5ZbXYvhma1Ew+LXtPs5dhQWSWf+c3/w+7C5ueLo1oYgByZquzEGqevkpNXTlTCRW1y9bofhEyApJ+k5geYF3AawB/Qf+gDlRDyywuWcxdLdPA0phYbHVWAfa4YX6Bg5UKaDVNpQX51n3FTqz8BlRElU4pSo0+OmZ3sWDNAzPgcx+fzZ2WqBvOWMUtbq4+kqw1fIfEMG5sEteN7fQ/vxwYuul8O6fCyBjIVmJ+dPfgGcO7geDkppDVZlmoKmaVi X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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(). Signed-off-by: Hugh Dickins Reviewed-by: Jan Kara --- mm/shmem.c | 56 ++++++++++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 5501a5bc8d8c..caee8ba841f7 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -756,7 +756,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, @@ -825,7 +825,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) { @@ -887,7 +887,6 @@ unsigned long shmem_partial_swap_usage(struct address_space *mapping, cond_resched_rcu(); } } - rcu_read_unlock(); return swapped << PAGE_SHIFT; @@ -1213,7 +1212,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; } @@ -2456,7 +2454,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); @@ -2481,11 +2478,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) { @@ -2697,7 +2693,6 @@ shmem_write_begin(struct file *file, struct address_space *mapping, } ret = shmem_get_folio(inode, index, &folio, SGP_WRITE); - if (ret) return ret; @@ -3229,8 +3224,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; @@ -3259,14 +3253,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; @@ -3303,7 +3294,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; @@ -3334,7 +3326,7 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr inode_inc_iversion(dir); inc_nlink(inode); ihold(inode); /* New dentry reference */ - dget(dentry); /* Extra pinning count for the created dentry */ + dget(dentry); /* Extra pinning count for the created dentry */ d_instantiate(dentry, inode); out: return ret; @@ -3354,7 +3346,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; } @@ -3464,7 +3456,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); @@ -3518,8 +3509,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; @@ -3593,8 +3583,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); @@ -3778,7 +3767,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) { @@ -4362,8 +4350,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; @@ -4666,11 +4654,9 @@ 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])); + shmem_huge == values[i] ? "%s[%s]" : "%s%s", + i ? " " : "", shmem_format_huge(values[i])); } - len += sysfs_emit_at(buf, len, "\n"); return len; @@ -4767,8 +4753,9 @@ 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, - umode_t mode, dev_t dev, unsigned long flags) +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); return inode ? inode : ERR_PTR(-ENOSPC); @@ -4778,8 +4765,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; @@ -4798,7 +4785,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);