github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 07:03:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

NFS: Extend rdirplus mount option with "force|none"

Browse Source 
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@redhat.com>
Link: https://lore.kernel.org/r/c4cf0de4c8be0930b91bc74bee310d289781cd3b.1741885071.git.bcodding@redhat.com
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Benjamin Coddington 2025-03-13 13:01:22 -04:00 committed by Trond Myklebust
parent 2d6a194f4b
commit cfe1f8776f
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/dir.c
View File

@ -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)
return true;
if (ctx->pos == 0 ||
cache_hits + cache_misses > NFS_READDIR_CACHE_USAGE_THRESHOLD)
return true;

32
fs/nfs/fs_context.c
View File

@ -72,6 +72,8 @@ enum nfs_param {
Opt_posix,
Opt_proto,
Opt_rdirplus,
Opt_rdirplus_none,
Opt_rdirplus_force,
Opt_rdma,
Opt_resvport,
Opt_retrans,
@ -174,7 +176,8 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = {
fsparam_u32 ("port", Opt_port),
fsparam_flag_no("posix", Opt_posix),
fsparam_string("proto", Opt_proto),
fsparam_flag_no("rdirplus", Opt_rdirplus),
fsparam_flag_no("rdirplus", Opt_rdirplus), // rdirplus|nordirplus
fsparam_string("rdirplus", Opt_rdirplus), // rdirplus=...
fsparam_flag ("rdma", Opt_rdma),
fsparam_flag_no("resvport", Opt_resvport),
fsparam_u32 ("retrans", Opt_retrans),
@ -288,6 +291,12 @@ static const struct constant_table nfs_xprtsec_policies[] = {
{}
};
static const struct constant_table nfs_rdirplus_tokens[] = {
{ "none", Opt_rdirplus_none },
{ "force", Opt_rdirplus_force },
{}
};
/*
* Sanity-check a server address provided by the mount command.
*
@ -636,10 +645,25 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
ctx->flags &= ~NFS_MOUNT_NOACL;
break;
case Opt_rdirplus:
if (result.negated)
if (result.negated) {
ctx->flags &= ~NFS_MOUNT_FORCE_RDIRPLUS;
ctx->flags |= NFS_MOUNT_NORDIRPLUS;
else
ctx->flags &= ~NFS_MOUNT_NORDIRPLUS;
} else if (!param->string) {
ctx->flags &= ~(NFS_MOUNT_NORDIRPLUS | NFS_MOUNT_FORCE_RDIRPLUS);
} else {
switch (lookup_constant(nfs_rdirplus_tokens, param->string, -1)) {
case Opt_rdirplus_none:
ctx->flags &= ~NFS_MOUNT_FORCE_RDIRPLUS;
ctx->flags |= NFS_MOUNT_NORDIRPLUS;
break;
case Opt_rdirplus_force:
ctx->flags &= ~NFS_MOUNT_NORDIRPLUS;
ctx->flags |= NFS_MOUNT_FORCE_RDIRPLUS;
break;
default:
goto out_invalid_value;
}
}
break;
case Opt_sharecache:
if (result.negated)

1
fs/nfs/super.c
View File

@ -454,6 +454,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
{ NFS_MOUNT_NONLM, ",nolock", "" },
{ NFS_MOUNT_NOACL, ",noacl", "" },
{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
{ NFS_MOUNT_FORCE_RDIRPLUS, ",rdirplus=force", "" },
{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
{ 0, NULL, NULL }

1
include/linux/nfs_fs_sb.h
View File

@ -167,6 +167,7 @@ struct nfs_server {
#define NFS_MOUNT_TRUNK_DISCOVERY 0x04000000
#define NFS_MOUNT_SHUTDOWN 0x08000000
#define NFS_MOUNT_NO_ALIGNWRITE 0x10000000
#define NFS_MOUNT_FORCE_RDIRPLUS 0x20000000
unsigned int fattr_valid; /* Valid attributes */
unsigned int caps; /* server capabilities */