diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 18:13:00 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-18 18:13:44 -0700 |
| commit | 1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81 (patch) | |
| tree | 143956f878290e85de7c9130f465e862f587ee53 /fs/nfs/callback.c | |
| parent | 301933a0acfdec837fd8b4884093b3f0fff01d8a (diff) | |
| parent | 4bf259e3ae5015e73282ba66716c4a917e1264ac (diff) | |
| download | linux-3.10-1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81.tar.gz linux-3.10-1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81.tar.bz2 linux-3.10-1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81.zip | |
Merge branch 'devel-for-2.6.31' into for-2.6.31
Conflicts:
fs/nfs/client.c
fs/nfs/super.c
Diffstat (limited to 'fs/nfs/callback.c')
| -rw-r--r-- | fs/nfs/callback.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index e69b8f61189..7f604c7941f 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -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) */ |