On Fri, 2008-08-15 at 16:47 -0400, Trond Myklebust wrote: > On Fri, 2008-08-15 at 16:34 -0400, Chuck Lever wrote: > > Trond, NFS_MOUNT_FLAGMASK is used in nfs_init_server() and > > nfs4_init_server() for both legacy binary and text-based mounts. This > > needs to be moved to a legacy-only path if we want to use the > > high-order 16 bits in the 'flags' field for text-based mounts. > > We definitely want to do this. The point of introducing text-based > mounts was to allow us to add functionality without having to worry > about legacy binary mount formats. The mask should be there in order to > ensure that binary formats don't start enabling features that they > cannot support. There is no justification for applying it to the text > mount path. I've attached the patch... Cheers Trond -- Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust@xxxxxxxxxx www.netapp.com
--- Begin Message ---
- Subject: No Subject
- From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
- Date: Fri, 15 Aug 2008 16:59:14 -0400
- Nfs: Don't apply NFS_MOUNT_FLAGMASK to text-based mounts
The point of introducing text-based mounts was to allow us to add functionality without having to worry about legacy binary mount formats. The mask should be there in order to ensure that binary formats don't start enabling features that they cannot support. There is no justification for applying it to the text mount path. Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> --- fs/nfs/client.c | 4 ++-- fs/nfs/super.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 2accb67..7547600 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -675,7 +675,7 @@ static int nfs_init_server(struct nfs_server *server, server->nfs_client = clp; /* Initialise the client representation from the mount data */ - server->flags = data->flags & NFS_MOUNT_FLAGMASK; + server->flags = data->flags; if (data->rsize) server->rsize = nfs_block_size(data->rsize, NULL); @@ -1072,7 +1072,7 @@ static int nfs4_init_server(struct nfs_server *server, goto error; /* Initialise the client representation from the mount data */ - server->flags = data->flags & NFS_MOUNT_FLAGMASK; + server->flags = data->flags; server->caps |= NFS_CAP_ATOMIC_OPEN; if (data->rsize) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index f67d44c..5725af9 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1544,7 +1544,7 @@ static int nfs_validate_mount_data(void *options, * Translate to nfs_parsed_mount_data, which nfs_fill_super * can deal with. */ - args->flags = data->flags; + args->flags = data->flags & NFS_MOUNT_FLAGMASK; args->rsize = data->rsize; args->wsize = data->wsize; args->timeo = data->timeo;
--- End Message ---
