On 13 Mar 2025, at 12:34, Trond Myklebust wrote: > On Thu, 2025-03-13 at 10:43 -0400, Benjamin Coddington wrote: >> There are certain users that wish to force the NFS client to choose >> READDIRPLUS over READDIR for a particular mount. Update the >> "rdirplus" mount >> option to optionally accept values. For "rdirplus=force", the NFS >> client >> will always attempt to use READDDIRPLUS. The setting of >> "rdirplus=none" is >> aliased to the existing "nordirplus". >> >> Signed-off-by: Benjamin Coddington <bcodding@xxxxxxxxxx> >> --- >> fs/nfs/dir.c | 2 ++ >> fs/nfs/fs_context.c | 32 ++++++++++++++++++++++++++++---- >> fs/nfs/super.c | 1 + >> include/linux/nfs_fs_sb.h | 1 + >> 4 files changed, 32 insertions(+), 4 deletions(-) >> >> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c >> index 2b04038b0e40..c9de0e474cf5 100644 >> --- a/fs/nfs/dir.c >> +++ b/fs/nfs/dir.c >> @@ -666,6 +666,8 @@ static bool nfs_use_readdirplus(struct inode >> *dir, struct dir_context *ctx, >> { >> if (!nfs_server_capable(dir, NFS_CAP_READDIRPLUS)) >> return false; >> + if (NFS_SERVER(dir)->flags && NFS_MOUNT_FORCE_RDIRPLUS) > > Bitwise and? Oh crap - my tests are junk. Ben