From owner-svn-src-head@freebsd.org Tue Sep 1 22:14:53 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C5FE937F7C6; Tue, 1 Sep 2020 22:14:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1b141q7z3V81; Tue, 1 Sep 2020 22:14:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D7DE20982; Tue, 1 Sep 2020 22:14:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MErMV063257; Tue, 1 Sep 2020 22:14:53 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MErau063255; Tue, 1 Sep 2020 22:14:53 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012214.081MErau063255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:14:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365228 - head/sys/nlm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/nlm X-SVN-Commit-Revision: 365228 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:14:53 -0000 Author: mjg Date: Tue Sep 1 22:14:52 2020 New Revision: 365228 URL: https://svnweb.freebsd.org/changeset/base/365228 Log: nlm: clean up empty lines in .c and .h files Modified: head/sys/nlm/nlm_advlock.c head/sys/nlm/nlm_prot_impl.c Modified: head/sys/nlm/nlm_advlock.c ============================================================================== --- head/sys/nlm/nlm_advlock.c Tue Sep 1 22:14:30 2020 (r365227) +++ head/sys/nlm/nlm_advlock.c Tue Sep 1 22:14:52 2020 (r365228) @@ -940,7 +940,6 @@ nlm_setlock(struct nlm_host *host, struct rpc_callextr */ break; } - } } else { error = nlm_map_status(res.stat.stat); Modified: head/sys/nlm/nlm_prot_impl.c ============================================================================== --- head/sys/nlm/nlm_prot_impl.c Tue Sep 1 22:14:30 2020 (r365227) +++ head/sys/nlm/nlm_prot_impl.c Tue Sep 1 22:14:52 2020 (r365228) @@ -167,7 +167,6 @@ struct timeval nlm_zero_tv = { 0, 0 }; */ int nlm_nsm_state; - /* * A lock to protect the host list and waiting lock list. */ @@ -326,7 +325,6 @@ nlm_copy_netobj(struct netobj *dst, struct netobj *src nlm_make_netobj(dst, src->n_bytes, src->n_len, type); } - /* * Create an RPC client handle for the given (address,prog,vers) * triple using UDP. @@ -644,7 +642,7 @@ nlm_cancel_async_lock(struct nlm_async_lock *af) } mtx_lock(&host->nh_lock); - + if (!error) { NLM_DEBUG(2, "NLM: async lock %p for %s (sysid %d) " "cancelled\n", af, host->nh_caller_name, host->nh_sysid); @@ -1061,7 +1059,6 @@ nlm_find_host_by_addr(const struct sockaddr *addr, int strlcpy(tmp, "", sizeof(tmp)); } - mtx_lock(&nlm_global_lock); /* @@ -1334,7 +1331,7 @@ nlm_deregister_wait_lock(void *handle) mtx_lock(&nlm_global_lock); TAILQ_REMOVE(&nlm_waiting_locks, nw, nw_link); mtx_unlock(&nlm_global_lock); - + free(nw, M_NLM); } @@ -1394,7 +1391,6 @@ nlm_cancel_wait(struct vnode *vp) mtx_unlock(&nlm_global_lock); } - /**********************************************************************/ /* @@ -1703,7 +1699,6 @@ sys_nlm_syscall(struct thread *td, struct nlm_syscall_ * NLM implementation details, called from the RPC stubs. */ - void nlm_sm_notify(struct nlm_sm_status *argp) { @@ -1738,7 +1733,7 @@ nlm_get_vfs_state(struct nlm_host *host, struct svc_re int error; uint64_t exflags; struct ucred *cred = NULL, *credanon = NULL; - + memset(vs, 0, sizeof(*vs)); vs->vs_mp = vfs_getvfs(&fhp->fh_fsid); @@ -1840,7 +1835,7 @@ nlm_do_test(nlm4_testargs *argp, nlm4_testres *result, int error, sysid; struct flock fl; accmode_t accmode; - + memset(result, 0, sizeof(*result)); memset(&vs, 0, sizeof(vs)); @@ -1938,7 +1933,7 @@ nlm_do_lock(nlm4_lockargs *argp, nlm4_res *result, str int error, sysid; struct flock fl; accmode_t accmode; - + memset(result, 0, sizeof(*result)); memset(&vs, 0, sizeof(vs)); @@ -2127,7 +2122,7 @@ nlm_do_cancel(nlm4_cancargs *argp, nlm4_res *result, s int error, sysid; struct flock fl; struct nlm_async_lock *af; - + memset(result, 0, sizeof(*result)); memset(&vs, 0, sizeof(vs)); @@ -2216,7 +2211,7 @@ nlm_do_unlock(nlm4_unlockargs *argp, nlm4_res *result, struct nlm_host *host; int error, sysid; struct flock fl; - + memset(result, 0, sizeof(*result)); memset(&vs, 0, sizeof(vs)); @@ -2276,7 +2271,7 @@ nlm_do_granted(nlm4_testargs *argp, nlm4_res *result, { struct nlm_host *host; struct nlm_waiting_lock *nw; - + memset(result, 0, sizeof(*result)); host = nlm_find_host_by_addr(svc_getrpccaller(rqstp), rqstp->rq_vers);