diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-05 12:01:22 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-05 12:01:22 +0800 |
| commit | 3ba1692e7239293d7bc5a596ca9b0707f5bc07d5 (patch) | |
| tree | e0a4ceba15a5ba39da4b3decc2e78a6754afc5ad /fs | |
| parent | 072c0f9ee4023f380774186c8cb95c0118d2f8dc (diff) | |
| parent | 87c6c6ef5b17bfed9226f1307435910626817ebb (diff) | |
Merge tag 'v4.4.36' into linux-linaro-lsk-v4.4
This is the 4.4.36 stable release
Diffstat (limited to 'fs')
| -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 52a28311e2a4..48efe62e1302 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -261,7 +261,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); |