From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Alexander Viro <viro@zeniv.linux.org.uk>
Cc:     Stephen Brennan <stephen.s.brennan@oracle.com>,
        Gautham Ananthakrishna <gautham.ananthakrishna@oracle.com>,
        Konstantin Khlebnikov <khlebnikov@yandex-team.ru>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] dcache: add action D_WALK_SKIP_SIBLINGS to d_walk()
Date:   Mon, 13 Dec 2021 16:53:36 -0800
Message-Id: <20211214005337.161885-4-stephen.s.brennan@oracle.com>
In-Reply-To: <20211214005337.161885-1-stephen.s.brennan@oracle.com>
References: <20211214005337.161885-1-stephen.s.brennan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uRhaAfpAc3d4qm41KUnpNdAPLnl+QepvsZi+rIVC394DHY+m5Lkpszl0mBqN?=
 =?us-ascii?Q?3SQWkbk2KVsdTrqlPA6yCRyxBVpwFgTz0jrnfUD83tKjztARqY4gNfvufQ/m?=
 =?us-ascii?Q?kL4fD6JoEg2sMR0axEOL5pVsiCCWn/Dep7cl1N16B33jMooxa3AwMc/iiUhg?=
 =?us-ascii?Q?bdyNnjZ/MBWj6GKHEQU93htCFoujyDGt2SACmAWpJfwdoZaytY/AY0Eq/HAA?=
 =?us-ascii?Q?tRTq4Os6QYyJvo7/MU12HZeoUVKHhnHmAiH8GT+vPpJ/YLaNj0c4tnMDZfQo?=
 =?us-ascii?Q?kO7kds9K6tvYgea5PlRrRs3soEY9DbQ6fq6zGXlP5exrVag8tZCSRWw8ni0n?=
 =?us-ascii?Q?tAK3NEOJyGMFmW13kiEvRVO1xh1AUs4MEwLDCXb+J9RpGCKLOR3F0nq2BjOC?=
 =?us-ascii?Q?d3wZsiZsWIkC1xg4UqpM0auqfajaKgBDK7s6RUcjafD60TG6knwdNzzS1UKz?=
 =?us-ascii?Q?BqrFNYiQAN/xrje5Og57p7z9sZkL3IvhOuGA9x+BxJj/Cp0bqWS3h3U3iB8n?=
 =?us-ascii?Q?p+6q3j8DEh9NYNa45PcaxCp6jwY3pWXS1HK4zHlyFhyba9Y4UMEHLdk088u9?=
 =?us-ascii?Q?fJDAIusjW8Nzw8SEzHx3t1b3m10NFzw0wB5iiRLf4nQWyCmQvMA3ONZz85N3?=
 =?us-ascii?Q?HgxGl1SHSG7D9I813sr8KLpjeU9XENURW+xn8MTVEh66MlSvm1xAKNkbIISS?=
 =?us-ascii?Q?CNqCqxR0+bpAF7vdPCDJcCrDVJ31DACH2gj5x4Z271tq3MfDXc6HWpzEWq3f?=
 =?us-ascii?Q?/wQemTjRpgsV0GiJW8v/EnlMV8l9drP6Xg2SQftg8q9OruY1E1fJirAjlw35?=
 =?us-ascii?Q?fU+lUsHRTmXU5PjJkz9UZTSwlXlQPEzauXNxPktxGo0QrL1Btgi3L+vFQAM9?=
 =?us-ascii?Q?oRKOKwZLJ4Ssxzk+1PIbjA34WiA/B+1I51BI+X/vv6TAH2o4bkQ1kMksjCIN?=
 =?us-ascii?Q?BKQiQW3KkYMTvFdY+vfnM4BDqDTagzzGQFFGUpRpjxyc9vUnED0wjyJ/68AI?=
 =?us-ascii?Q?WGJ5ucHaBSqApJxaZcKpkB2KRANA7rpJvS6qF/GQ//kTXJa/oej02agkuQeT?=
 =?us-ascii?Q?k7S2kLBIh91H/XhSvj13ydnbhhGfN/TtIDkLJ8O7E3GzrOM5/+exltaWOms5?=
 =?us-ascii?Q?BYkvQKw9XTG1UL9EOe1L587wYs+3XlSfDX2IUKTX8XSmpV9mzCwqTzilc/qw?=
 =?us-ascii?Q?MOYD03bv+ShO8XNZ8oD8HftO9FDl7IlhgTKm8uqPEh0h225SQTEHXb69TzHr?=
 =?us-ascii?Q?Zuwk6poO6zLuyIALI2N1annEakiQ/ivK2J4nF10mIqTV2Yr8R5CGK0BwahZS?=
 =?us-ascii?Q?0XoaRy4ZnU5CM8G0F5JAsgZ9q/5aZRJYVXSf47cpmWq2brS+8rJZE+FVVeWu?=
 =?us-ascii?Q?6Hqi5sbXeURol0/EgbnW4c+xaXyRW5kuUIBQ5H4Yyx89nK0nNPf5Zk0+NEBW?=
 =?us-ascii?Q?A+UFMhoQXGrPUiDn1XGO5O3LM8kzBzYZ/XFRAZhlF3z9unnd3IvOz/xCzj6I?=
 =?us-ascii?Q?yU9cv+t6P+apPQ8Odd2+QAZRJwWAWASeCkPWO+4dFQ5FGJ7N194WqawoLgyA?=
 =?us-ascii?Q?EgUuUL5DphhFYCQ+OCUMSg/NZi9LWIywNayb+Zv22de8Xvzb+sey6QPVTY4w?=
 =?us-ascii?Q?NwJlfFZRoZysjbFGdIRMlk+eVxeOUvMVWSHcH6E2wtpJNI1C5lJcVKFqxOF8?=
 =?us-ascii?Q?MMoWfQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fe398783-f645-4664-c3c4-08d9be9c2ff6
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 00:53:47.9606
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: HymrENI/MUnhoVXCKnzfSu++zWmj4lhZLnq55ZSnT6YTxw7S0Lx7UCdkZRN7xkpr+/KkNJ5ra7w2/GyHAh1t3dQp2gy6rlA8rCm6EWesvDY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB3893
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10197 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999
 suspectscore=0 bulkscore=0 mlxscore=0 spamscore=0 adultscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2112140001
X-Proofpoint-ORIG-GUID: ttUHbSxXJbyaQkp8dbDL7l3kyegcUqgV
X-Proofpoint-GUID: ttUHbSxXJbyaQkp8dbDL7l3kyegcUqgV
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

This lets skip remaining siblings at seeing d_is_tail_negative().

Co-authored-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Co-authored-by: Gautham Ananthakrishna <gautham.ananthakrishna@oracle.com>
Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---
 fs/dcache.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/dcache.c b/fs/dcache.c
index 685b91866e59..9083436f5dcb 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1366,12 +1366,14 @@ EXPORT_SYMBOL(shrink_dcache_sb);
  * @D_WALK_QUIT:	quit walk
  * @D_WALK_NORETRY:	quit when retry is needed
  * @D_WALK_SKIP:	skip this dentry and its children
+ * @D_WALK_SKIP_SIBLINGS: skip siblings and their children
  */
 enum d_walk_ret {
 	D_WALK_CONTINUE,
 	D_WALK_QUIT,
 	D_WALK_NORETRY,
 	D_WALK_SKIP,
+	D_WALK_SKIP_SIBLINGS,
 };
 
 /**
@@ -1402,6 +1404,7 @@ static void d_walk(struct dentry *parent, void *data,
 		break;
 	case D_WALK_QUIT:
 	case D_WALK_SKIP:
+	case D_WALK_SKIP_SIBLINGS:
 		goto out_unlock;
 	case D_WALK_NORETRY:
 		retry = false;
@@ -1433,6 +1436,9 @@ static void d_walk(struct dentry *parent, void *data,
 		case D_WALK_SKIP:
 			spin_unlock(&dentry->d_lock);
 			continue;
+		case D_WALK_SKIP_SIBLINGS:
+			spin_unlock(&dentry->d_lock);
+			goto skip_siblings;
 		}
 
 		if (!list_empty(&dentry->d_subdirs)) {
@@ -1444,6 +1450,7 @@ static void d_walk(struct dentry *parent, void *data,
 		}
 		spin_unlock(&dentry->d_lock);
 	}
+skip_siblings:
 	/*
 	 * All done at this level ... ascend and resume the search.
 	 */
-- 
2.30.2