From 8799e7037c1bbc9fe99d7300bd2bb506ef47d162 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Sun, 19 Feb 2012 08:44:07 +0100 Subject: [PATCH] --- yaml --- r: 294490 b: refs/heads/master c: 9937347a1ee6a67e450cc9e90750ce0b10abfe75 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7c8422a16015..17f33a5bcb50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a702195234eb77c4097148285cccf7f095de9cf +refs/heads/master: 9937347a1ee6a67e450cc9e90750ce0b10abfe75 diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index d05024a18984..6708f3044eb0 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -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; @@ -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;