From nobody Sat Apr 9 21:48:18 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 18F8D1A8AE0F; Sat, 9 Apr 2022 21:48:19 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KbTJL5mLLz4dTf; Sat, 9 Apr 2022 21:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649540898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXgcAV7J0kO28qUConWDgetvLNAAWdDJPUSsrkPNnO4=; b=DoaqcjkcWZ0B47PH9sJ96l92sjBoSYEGli+KeAE/4Awhqzi48Uj9R52CXXEdwXTLTBBzvn 28onOirEjxkxDaqK9cfvOWDLTItyQq+pIjLybvYt0wltp5MbSGx0Z5KwOsJiK1XW9EJW7t turkYnK5JMUEB0hT+7phnaN5cfJrQxrLCDE2yRKO7iTLStn/efl6QyZmBB/+LmIr7vEgFO jhJpM9st6s12MenqCoRwU7Zo3qvefIM8oNDC3PpNtf7nzzHL3uuXyqbhPU9aFIOxRPnrxQ J1oR1ZNJtgjBV3P0i3VPtF0VkikAar57DDHMRCO6PnlzP2GfJUAwM8QvsRwFIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E522215EC; Sat, 9 Apr 2022 21:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 239LmIPB093008; Sat, 9 Apr 2022 21:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 239LmIfn093007; Sat, 9 Apr 2022 21:48:18 GMT (envelope-from git) Date: Sat, 9 Apr 2022 21:48:18 GMT Message-Id: <202204092148.239LmIfn093007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 59e85819be69 - main - lockf: remove lf_inode from struct lockf_entry List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59e85819be69d354fa6f390b791fd9cd06a80f35 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649540898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXgcAV7J0kO28qUConWDgetvLNAAWdDJPUSsrkPNnO4=; b=CneTaHhq0wf4LyDfb3HVp6+U4/cgF59htdLwJGpGkIgOKS+UIPJxvfqYLsC1zFuAUqIsm3 Shjxb0CU6tg4oyVGw2hDxC3jwdv+s8dWSf/PauE0kqCS263gq3qs2+RHUatuFMvzCNt6LZ v7d7PMyqxzWwtX8nlQUsili+Cgi7hfTMNu88BHJ/JBsliSmHgIsZ3JLGZfzekk3St0F+SQ x4FgO+q/HhvXRVQj6Mc5zeuE17aeXmVInDQykwFKmOVS9litdT7sgylYRdKL2DmWKHn5Qx ePjs9//aMwkXvrcp2tS9uYdklvnnDjS5rpjUuew9wWDboQ8/JsINVU+AwWrWoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649540898; a=rsa-sha256; cv=none; b=amRuABX4Aik1JDSkGGIWLVZdLPF0wEvcEe5/mSb/Vqvwb2xCcfMdBQzAUr+sQYTq29awiQ n11DPkeU8PIy1spr9aAnIneitticF2SqQ1mYuSKqt2P3OG1KbUYmoIOISLIFtTl7WJKk0k B6m+hHvvPOkNIwtswbLWLGRclxD7ayQzGSaSWqMEeptK+Yq7rYnPYIh2h2cJg59YHW4uWI mYUqRrHtZ8zV3f/OOCB5Vftvvhh8cAjuCaGrbveLJYj3klQMHYzFfj++iBueBKi3WUpqXH c92nRveBImXbxTCrhcq1JvfywBx5B/JzK8QyRXN8RymEx6mR3meYhdf2tX1YYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=59e85819be69d354fa6f390b791fd9cd06a80f35 commit 59e85819be69d354fa6f390b791fd9cd06a80f35 Author: Konstantin Belousov AuthorDate: 2022-04-01 20:34:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-09 21:43:53 +0000 lockf: remove lf_inode from struct lockf_entry The UFS-specific struct inode cannot be used in generic advisory lock code. It was probably used as a shortcut for the debugging, as the remnants of the code around it indicates. Use somewhat more verbose and less concentrated, but universal, VOP_PRINT(), where needed. Reviewed by: markj, rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34756 --- sys/kern/kern_lockf.c | 20 +++----------------- sys/sys/lockf.h | 1 - 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index 8a54e4700d20..079f7b999835 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -571,13 +571,6 @@ retry_setlock: vref(vp); } - /* - * XXX The problem is that VTOI is ufs specific, so it will - * break LOCKF_DEBUG for all other FS's other than UFS because - * it casts the vnode->data ptr to struct inode *. - */ -/* lock->lf_inode = VTOI(ap->a_vp); */ - lock->lf_inode = (struct inode *)0; lock->lf_type = fl->l_type; LIST_INIT(&lock->lf_outedges); LIST_INIT(&lock->lf_inedges); @@ -2498,10 +2491,8 @@ lf_print(char *tag, struct lockf_entry *lock) printf("%s: lock %p for ", tag, (void *)lock); lf_print_owner(lock->lf_owner); - if (lock->lf_inode != (struct inode *)0) - printf(" in ino %ju on dev <%s>,", - (uintmax_t)lock->lf_inode->i_number, - devtoname(ITODEV(lock->lf_inode))); + printf("\nvnode %p", lock->lf_vnode); + VOP_PRINT(lock->lf_vnode); printf(" %s, start %jd, end ", lock->lf_type == F_RDLCK ? "shared" : lock->lf_type == F_WRLCK ? "exclusive" : @@ -2524,12 +2515,7 @@ lf_printlist(char *tag, struct lockf_entry *lock) struct lockf_entry *lf, *blk; struct lockf_edge *e; - if (lock->lf_inode == (struct inode *)0) - return; - - printf("%s: Lock list for ino %ju on dev <%s>:\n", - tag, (uintmax_t)lock->lf_inode->i_number, - devtoname(ITODEV(lock->lf_inode))); + printf("%s: Lock list for vnode %p:\n", tag, lock->lf_vnode); LIST_FOREACH(lf, &lock->lf_vnode->v_lockf->ls_active, lf_link) { printf("\tlock %p for ",(void *)lf); lf_print_owner(lock->lf_owner); diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h index 368c773283ec..cca02501a462 100644 --- a/sys/sys/lockf.h +++ b/sys/sys/lockf.h @@ -77,7 +77,6 @@ struct lockf_entry { off_t lf_end; /* (s) Byte # of the end of the lock (OFF_MAX=EOF) */ struct lock_owner *lf_owner; /* (c) Owner of the lock */ struct vnode *lf_vnode; /* (c) File being locked (only valid for active lock) */ - struct inode *lf_inode; /* (c) Back pointer to the inode */ struct task *lf_async_task;/* (c) Async lock callback */ LIST_ENTRY(lockf_entry) lf_link; /* (s) Linkage for lock lists */ struct lockf_edge_list lf_outedges; /* (s) list of out-edges */