lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'devel-for-2.6.31' into for-2.6.31

Browse Source 
Conflicts:
	fs/nfs/client.c
	fs/nfs/super.c
This commit is contained in:
Trond Myklebust
2009-06-17 18:13:00 -07:00
parent 301933a0ac 4bf259e3ae
commit 1f84603c09
18 changed files with 633 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/callback.c
View File

@@ -123,7 +123,9 @@ nfs4_callback_up(struct svc_serv *serv)
nfs_callback_tcpport6 = ret;
dprintk("NFS: Callback listener port = %u (af %u)\n",
nfs_callback_tcpport6, PF_INET6);
} else if (ret != -EAFNOSUPPORT)
} else if (ret == -EAFNOSUPPORT)
ret = 0;
else
goto out_err;
#endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */