diff mbox series

[20/22] gfs2: use is_subdir()

Message ID	20231220053157.GS1674809@ZenIV (mailing list archive)
State	New, archived
Headers	show Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [62.89.141.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A40E9FBE0; Wed, 20 Dec 2023 05:31:58 +0000 (UTC) Date: Wed, 20 Dec 2023 05:31:57 +0000 From: Al Viro <viro@zeniv.linux.org.uk> To: linux-fsdevel@vger.kernel.org Cc: gfs2@lists.linux.dev Subject: [PATCH 20/22] gfs2: use is_subdir() Message-ID: <20231220053157.GS1674809@ZenIV> References: <20231220051348.GY1674809@ZenIV> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231220051348.GY1674809@ZenIV> Sender: Al Viro <viro@ftp.linux.org.uk>
Series	PATCH 01/22] hostfs: use d_splice_alias() calling conventions to simplify failure exits \| expand PATCH 01/22] hostfs: use d_splice_alias() calling conventions to simplify failure exits [02/22] /proc/sys: use d_splice_alias() calling conventions to simplify failure exits [03/22] zonefs: d_splice_alias() will do the right thing on ERR_PTR() inode [04/22] udf: d_splice_alias() will do the right thing on ERR_PTR() inode [05/22] affs: d_obtain_alias(ERR_PTR(...)) will do the right thing [06/22] befs: d_obtain_alias(ERR_PTR(...)) will do the right thing [07/22] ceph: d_obtain_{alias,root}(ERR_PTR(...)) will do the right thing [08/22] gfs2: d_obtain_alias(ERR_PTR(...)) will do the right thing [09/22] kernfs: d_obtain_alias(NULL) will do the right thing... [11/22] udf: d_obtain_alias(ERR_PTR(...)) will do the right thing... [12/22] ext4_add_entry(): ->d_name.len is never 0 [13/22] bfs_add_entry(): get rid of pointless ->d_name.len checks [14/22] __ocfs2_add_entry(), ocfs2_prepare_dir_for_insert(): namelen checks [15/22] reiserfs_add_entry(): get rid of pointless namelen checks [16/22] udf_fiiter_add_entry(): check for zero ->d_name.len is bogus... [17/22] get rid of passing callbacks to ceph __dentry_leases_walk() [18/22] nfsd: kill stale comment about simple_fill_super() requirements [19/22] ocfs2_find_match(): there's no such thing as NULL or negative ->d_parent [20/22] gfs2: use is_subdir() [21/22] orangefs: saner arguments passing in readdir guts [22/22] apparmorfs: don't duplicate kfree_link()

Commit Message

Al Viro Dec. 20, 2023, 5:31 a.m. UTC

... instead of reimplementing it with misguiding name (is_ancestor(x, y)
would normally imply "x is an ancestor of y", not the other way round).
With races, while we are at it...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/gfs2/super.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff mbox series

Patch

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index d21c04a22d73..b5c75c8a8d62 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1065,16 +1065,6 @@  static int gfs2_drop_inode(struct inode *inode)
 	return generic_drop_inode(inode);
 }
 
-static int is_ancestor(const struct dentry *d1, const struct dentry *d2)
-{
-	do {
-		if (d1 == d2)
-			return 1;
-		d1 = d1->d_parent;
-	} while (!IS_ROOT(d1));
-	return 0;
-}
-
 /**
  * gfs2_show_options - Show mount options for /proc/mounts
  * @s: seq_file structure
@@ -1096,7 +1086,7 @@  static int gfs2_show_options(struct seq_file *s, struct dentry *root)
 	statfs_slow = sdp->sd_tune.gt_statfs_slow;
 	spin_unlock(&sdp->sd_tune.gt_spin);
 
-	if (is_ancestor(root, sdp->sd_master_dir))
+	if (is_subdir(root, sdp->sd_master_dir))
 		seq_puts(s, ",meta");
 	if (args->ar_lockproto[0])
 		seq_show_option(s, "lockproto", args->ar_lockproto);