From: Jeff Layton Date: Tue, 15 Jul 2008 16:35:20 +0000 (-0400) Subject: lockd: nlm_release_host() checks for NULL, caller needn't X-Git-Tag: v2.6.27-rc1~961^2~7 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0e92aae157cbf78ede7b7dd03967b49fcb2102e;p=linux-2.6 lockd: nlm_release_host() checks for NULL, caller needn't No need to check for a NULL argument twice. Signed-off-by: Jeff Layton Signed-off-by: J. Bruce Fields --- diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index 385437e338..006a832d46 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c @@ -58,8 +58,7 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, return 0; no_locks: - if (host) - nlm_release_host(host); + nlm_release_host(host); if (error) return error; return nlm_lck_denied_nolocks; diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 88379cc6e0..fce3d70396 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -87,8 +87,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, return 0; no_locks: - if (host) - nlm_release_host(host); + nlm_release_host(host); if (error) return error; return nlm_lck_denied_nolocks;