From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58EEBC433FE for ; Thu, 28 Oct 2021 09:48:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0722C610D2 for ; Thu, 28 Oct 2021 09:48:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0722C610D2 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=cloudflare.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 8BCDC6B0073; Thu, 28 Oct 2021 05:48:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 86C9C6B0074; Thu, 28 Oct 2021 05:48:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70D8E6B0075; Thu, 28 Oct 2021 05:48:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id 4CDE06B0073 for ; Thu, 28 Oct 2021 05:48:23 -0400 (EDT) Received: from smtpin32.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id DF61739B0D for ; Thu, 28 Oct 2021 09:48:22 +0000 (UTC) X-FDA: 78745370844.32.5BEEDF0 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by imf09.hostedemail.com (Postfix) with ESMTP id 5A7C6300012D for ; Thu, 28 Oct 2021 09:48:22 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id m22so9174070wrb.0 for ; Thu, 28 Oct 2021 02:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TDEJin9Wub/pTmZCaG0ahvo3TESho8nP0MZ/DG5F4bU=; b=Fq7FjlAbZV5zR/iWtDoqRfxsQKOz3/NHuIDK/MgY5Uz+X8Bzve19JOmFMCKZtHnc6C 3JxZxqr5idu9by/1C9tNk29r5SoxWsPFNh4ZvUOyQuzMqlwxlTBnfcpI7COiVFzwU5i7 Kh46iOm6VO6gPmtmj2vn2dabUejlwv7uesL9o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TDEJin9Wub/pTmZCaG0ahvo3TESho8nP0MZ/DG5F4bU=; b=ViBUPBPBlaeZoQN6fAnLn5tbOKao/kl/w4uNBSYo1NvvyAcdZ76mDdSbyN4m56YTes KQ0TWjXvX9WzOw9tdv/1Me0a1zLgz1JanNttwK2BCbABozsBwhrHu00gYE85SaS2kxJ0 pdVGO4clQDVPrq1V3rHZ+0Ypbw2BFmRkDVZa8cXpj5s3cTRxlsbOpHT/XdAE/QEkEy+I 8uyneXpLon2v65SIpGZp/8bJupy4ncELAMM69ENk80XsaOlqmyc70fc1vs3piGgrgDCd AdFQUfTlA9k5E48JEhF+SanJXhxDnZV2465fuSMEO+DuCrpntPiZFcQPtAOilOEZl20W WJbg== X-Gm-Message-State: AOAM533pq0MRtciqV/1rj7pqrtzWqTt8f9dr0n8ro39SFkgPTr/auc+k EH6iZkPbec3jjQB5ymZRekCv9g== X-Google-Smtp-Source: ABdhPJzuPEadJHFC6DHS+OKXKCrBNBoHbYtFLfXrapFarUbsAE/PiuGk7n5gPew0+g/APt+J5HIwJA== X-Received: by 2002:a5d:4d52:: with SMTP id a18mr4233102wru.406.1635414500859; Thu, 28 Oct 2021 02:48:20 -0700 (PDT) Received: from altair.lan (2.f.6.6.b.3.3.0.3.a.d.b.6.0.6.0.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff:606:bda3:33b:66f2]) by smtp.googlemail.com with ESMTPSA id i6sm3378029wry.71.2021.10.28.02.48.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 02:48:20 -0700 (PDT) From: Lorenz Bauer To: viro@zeniv.linux.org.uk, Hugh Dickins , Andrew Morton , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: mszeredi@redhat.com, gregkh@linuxfoundation.org, Lorenz Bauer , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf-next v3 1/4] libfs: move shmem_exchange to simple_rename_exchange Date: Thu, 28 Oct 2021 10:47:21 +0100 Message-Id: <20211028094724.59043-2-lmb@cloudflare.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211028094724.59043-1-lmb@cloudflare.com> References: <20211028094724.59043-1-lmb@cloudflare.com> MIME-Version: 1.0 X-Stat-Signature: 7ysp7uenceo89jeejj9iqwptbybprjid X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5A7C6300012D Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=cloudflare.com header.s=google header.b=Fq7FjlAb; dmarc=pass (policy=reject) header.from=cloudflare.com; spf=none (imf09.hostedemail.com: domain of lmb@cloudflare.com has no SPF policy when checking 209.85.221.46) smtp.mailfrom=lmb@cloudflare.com X-HE-Tag: 1635414502-408465 Content-Transfer-Encoding: quoted-printable 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: Move shmem_exchange and make it available to other callers. Suggested-by: Signed-off-by: Lorenz Bauer --- fs/libfs.c | 24 ++++++++++++++++++++++++ include/linux/fs.h | 2 ++ mm/shmem.c | 24 +----------------------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index 51b4de3b3447..1cf144dc9ed2 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -448,6 +448,30 @@ int simple_rmdir(struct inode *dir, struct dentry *d= entry) } EXPORT_SYMBOL(simple_rmdir); =20 +int simple_rename_exchange(struct inode *old_dir, struct dentry *old_den= try, + struct inode *new_dir, struct dentry *new_dentry) +{ + bool old_is_dir =3D d_is_dir(old_dentry); + bool new_is_dir =3D d_is_dir(new_dentry); + + if (old_dir !=3D new_dir && old_is_dir !=3D new_is_dir) { + if (old_is_dir) { + drop_nlink(old_dir); + inc_nlink(new_dir); + } else { + drop_nlink(new_dir); + inc_nlink(old_dir); + } + } + old_dir->i_ctime =3D old_dir->i_mtime =3D + new_dir->i_ctime =3D new_dir->i_mtime =3D + d_inode(old_dentry)->i_ctime =3D + d_inode(new_dentry)->i_ctime =3D current_time(old_dir); + + return 0; +} +EXPORT_SYMBOL_GPL(simple_rename_exchange); + int simple_rename(struct user_namespace *mnt_userns, struct inode *old_d= ir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) diff --git a/include/linux/fs.h b/include/linux/fs.h index e7a633353fd2..333b8af405ce 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3383,6 +3383,8 @@ extern int simple_open(struct inode *inode, struct = file *file); extern int simple_link(struct dentry *, struct inode *, struct dentry *)= ; extern int simple_unlink(struct inode *, struct dentry *); extern int simple_rmdir(struct inode *, struct dentry *); +extern int simple_rename_exchange(struct inode *old_dir, struct dentry *= old_dentry, + struct inode *new_dir, struct dentry *new_dentry); extern int simple_rename(struct user_namespace *, struct inode *, struct dentry *, struct inode *, struct dentry *, unsigned int); diff --git a/mm/shmem.c b/mm/shmem.c index b5860f4a2738..a18dde3d3092 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2945,28 +2945,6 @@ static int shmem_rmdir(struct inode *dir, struct d= entry *dentry) return shmem_unlink(dir, dentry); } =20 -static int shmem_exchange(struct inode *old_dir, struct dentry *old_dent= ry, struct inode *new_dir, struct dentry *new_dentry) -{ - bool old_is_dir =3D d_is_dir(old_dentry); - bool new_is_dir =3D d_is_dir(new_dentry); - - if (old_dir !=3D new_dir && old_is_dir !=3D new_is_dir) { - if (old_is_dir) { - drop_nlink(old_dir); - inc_nlink(new_dir); - } else { - drop_nlink(new_dir); - inc_nlink(old_dir); - } - } - old_dir->i_ctime =3D old_dir->i_mtime =3D - new_dir->i_ctime =3D new_dir->i_mtime =3D - d_inode(old_dentry)->i_ctime =3D - d_inode(new_dentry)->i_ctime =3D current_time(old_dir); - - return 0; -} - static int shmem_whiteout(struct user_namespace *mnt_userns, struct inode *old_dir, struct dentry *old_dentry) { @@ -3012,7 +2990,7 @@ static int shmem_rename2(struct user_namespace *mnt= _userns, return -EINVAL; =20 if (flags & RENAME_EXCHANGE) - return shmem_exchange(old_dir, old_dentry, new_dir, new_dentry); + return simple_rename_exchange(old_dir, old_dentry, new_dir, new_dentry= ); =20 if (!simple_empty(new_dentry)) return -ENOTEMPTY; --=20 2.32.0