summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-11 22:01:21 +0100
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-30 19:14:50 +0100
commiteeea5361634eeef9a09b7b5ae449b41623c23886 (patch)
treebcfa36587b116931e3645f2d91f98ba6b0879704 /fs
parentNFS: Fix inconsistent indentation in nfs4proc.c (diff)
downloadlinux-eeea5361634eeef9a09b7b5ae449b41623c23886.tar.xz
linux-eeea5361634eeef9a09b7b5ae449b41623c23886.zip
NFS: Clean up _nfs4_is_integrity_protected()
We can cut out the if statement and return the results of the comparison directly. Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 328eda9e6db1..3f5d4fd4e95a 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -577,12 +577,7 @@ nfs4_async_handle_error(struct rpc_task *task, struct nfs_server *server,
static bool _nfs4_is_integrity_protected(struct nfs_client *clp)
{
rpc_authflavor_t flavor = clp->cl_rpcclient->cl_auth->au_flavor;
-
- if (flavor == RPC_AUTH_GSS_KRB5I ||
- flavor == RPC_AUTH_GSS_KRB5P)
- return true;
-
- return false;
+ return (flavor == RPC_AUTH_GSS_KRB5I) || (flavor == RPC_AUTH_GSS_KRB5P);
}
static void do_renew_lease(struct nfs_client *clp, unsigned long timestamp)