diff options
| author |  bjschuma@gmail.com <bjschuma@gmail.com>
| 2012-08-08 13:57:06 -0400 |
|---|---|---|
| committer |  Trond Myklebust <Trond.Myklebust@netapp.com>
| 2012-08-16 16:15:49 -0400 |
| commit | 1ae811ee27912a0521e4b92dc9a1850c0243a247 (patch) | |
| tree | 11dddf11209a60b9063bc64cd5fdd86f9983a180 /fs/nfs/client.c | |
| parent | NFSv4.1: Remove a bogus BUG_ON() in nfs4_layoutreturn_done (diff) | |
| download | linux-1ae811ee27912a0521e4b92dc9a1850c0243a247.tar.gz linux-1ae811ee27912a0521e4b92dc9a1850c0243a247.tar.bz2 linux-1ae811ee27912a0521e4b92dc9a1850c0243a247.zip | |
NFS: Fix a regression when loading the NFS v4 module
Some systems have a modprobe.d/nfs.conf file that sets an nfs4 alias
pointing to nfs.ko, rather than nfs4.ko. This can prevent the v4 module
from loading on mount, since the kernel sees that something named "nfs4"
has already been loaded. To work around this, I've renamed the modules
to "nfsv2.ko" "nfsv3.ko" and "nfsv4.ko".
I also had to move the nfs4_fs_type back to nfs.ko to ensure that `mount
-t nfs4` still works.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
| -rw-r--r-- | fs/nfs/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 9fc0d9dfc91b..99694442b93f 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -105,7 +105,7 @@ struct nfs_subversion *get_nfs_version(unsigned int version) if (IS_ERR(nfs)) { mutex_lock(&nfs_version_mutex); - request_module("nfs%d", version); + request_module("nfsv%d", version); nfs = find_nfs_version(version); mutex_unlock(&nfs_version_mutex); } |