Skip to content

Commit

Permalink
NFS: Ensure that the nfs_client 'net' field is always set
Browse files Browse the repository at this point in the history
Currently, the nfs_parsed_mount_data->net field is initialised in
the nfs_parse_mount_options() function, which means that it only
gets set if we're using text based mounts. The legacy binary
mount interface is therefore broken.

Fix is to initialise the ->net field in nfs_alloc_parsed_mount_data.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Feb 19, 2012
1 parent 0a70219 commit 9937347
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,7 @@ static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(unsigned int ve
data->auth_flavor_len = 1;
data->version = version;
data->minorversion = 0;
data->net = current->nsproxy->net_ns;
security_init_mnt_opts(&data->lsm_opts);
}
return data;
Expand Down Expand Up @@ -1110,8 +1111,6 @@ static int nfs_parse_mount_options(char *raw,

free_secdata(secdata);

mnt->net = current->nsproxy->net_ns;

while ((p = strsep(&raw, ",")) != NULL) {
substring_t args[MAX_OPT_ARGS];
unsigned long option;
Expand Down

0 comments on commit 9937347

Please sign in to comment.