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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 860A2C282CD for ; Tue, 29 Jan 2019 00:34:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 432F4217F5 for ; Tue, 29 Jan 2019 00:34:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="Dk0M7rEU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726803AbfA2Aer (ORCPT ); Mon, 28 Jan 2019 19:34:47 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:39476 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726713AbfA2Aer (ORCPT ); Mon, 28 Jan 2019 19:34:47 -0500 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0T0OlZX013101 for ; Mon, 28 Jan 2019 16:34:46 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=6o/knY0xV1+OBK/d8C+xbCVurP7hXQFTl/ByuGod6hg=; b=Dk0M7rEUtFBhUFsqpsKex2BEDSC9hlHPGBbQGgg8h5MiRWbUPtHsze4+vr7XqslhoFwd Ho1ueRIDLmUBjMrPMWTKki1zuzyamJsQe2AbfU5an8V58qsyKiFFrpU4ZB5hEboOQcM3 vZSAqzri+ckjeX5LIuEZog4/jrEFtl6yIBE= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 2qab18092e-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 28 Jan 2019 16:34:46 -0800 Received: from mx-out.facebook.com (2620:10d:c0a1:3::13) by mail.thefacebook.com (2620:10d:c021:18::173) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.1.1531.3; Mon, 28 Jan 2019 16:34:42 -0800 Received: by devvm6397.prn2.facebook.com (Postfix, from userid 138655) id 397A88486707; Mon, 28 Jan 2019 16:34:41 -0800 (PST) Smtp-Origin-Hostprefix: devvm From: Chad Austin Smtp-Origin-Hostname: devvm6397.prn2.facebook.com To: CC: , , Chad Austin Smtp-Origin-Cluster: prn2c23 Subject: [PATCH] fuse: cache readdir calls if filesystem opts out of opendir Date: Mon, 28 Jan 2019 16:34:34 -0800 Message-ID: <20190129003434.316288-1-chadaustin@fb.com> X-Mailer: git-send-email 2.17.1 X-FB-Internal: Safe MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-28_14:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org If a filesystem returns ENOSYS from opendir and thus opts out of opendir and releasedir requests, it almost certainly would also like readdir results cached. Default open_flags to FOPEN_KEEP_CACHE and FOPEN_CACHE_DIR in that case. With this patch, I've measured recursive directory enumeration across large FUSE mounts to be faster than native mounts. Signed-off-by: Chad Austin --- fs/fuse/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index cc6ffd23b80f..06096b60f1df 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -124,7 +124,8 @@ int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file, return -ENOMEM; ff->fh = 0; - ff->open_flags = FOPEN_KEEP_CACHE; /* Default for no-open */ + /* Default for no-open */ + ff->open_flags = FOPEN_KEEP_CACHE | (isdir ? FOPEN_CACHE_DIR : 0); if (isdir ? !fc->no_opendir : !fc->no_open) { struct fuse_open_out outarg; int err; -- 2.17.1