diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-02 11:13:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-02 11:13:44 +0100 |
| commit | 1b95b1a06cb27badb3e53329fb56af2a2113fd80 (patch) | |
| tree | bbe52b10fde003833c980b0a30dd23b0e0855c87 /fs/nfs/callback.c | |
| parent | 3cded41794818d788aa1dc028ede4a1c1222d937 (diff) | |
| parent | 1be5d4fa0af34fb7bafa205aeb59f5c7cc7a089d (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/callback.c')
| -rw-r--r-- | fs/nfs/callback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 532d8e242d4d..484bebc20bca 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -197,7 +197,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, } ret = -EPROTONOSUPPORT; - if (minorversion == 0) + if (!IS_ENABLED(CONFIG_NFS_V4_1) || minorversion == 0) ret = nfs4_callback_up_net(serv, net); else if (xprt->ops->bc_up) ret = xprt->ops->bc_up(serv, net); |