From: bjschuma@gmail.com Date: Wed, 8 Aug 2012 17:57:06 +0000 (-0400) Subject: NFS: Fix a regression when loading the NFS v4 module X-Git-Tag: v3.6-rc3~6^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ae811ee27912a0521e4b92dc9a1850c0243a247;p=pandora-kernel.git 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 Signed-off-by: Trond Myklebust --- Reading git-diff-tree failed