From owner-cvs-src@FreeBSD.ORG Mon Nov 13 17:42:01 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D830716A5E3 for ; Mon, 13 Nov 2006 17:42:01 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.186]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73AEC43DCF for ; Mon, 13 Nov 2006 17:37:34 +0000 (GMT) (envelope-from kip.macy@gmail.com) Received: by nf-out-0910.google.com with SMTP id l23so530190nfc for ; Mon, 13 Nov 2006 09:37:03 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=MxOW/AuV2WDwhz9A3LhJAsuyCYQ844cVb+jX64l3zYH3V6R/qAzZH1aWWLPMNi6/81kNQMpZvrIkvUAZWini1+/iYkCddwn+QZFtnHwc1ZXWZ2+UQ5yjaQ3MdMsdcN+Md4AS8cpfsHU8mNBmG10BwwZeRUX4ACk/VwoYEiQ4QGc= Received: by 10.82.136.4 with SMTP id j4mr84418bud.1163439422809; Mon, 13 Nov 2006 09:37:02 -0800 (PST) Received: by 10.82.191.20 with HTTP; Mon, 13 Nov 2006 09:37:02 -0800 (PST) Message-ID: Date: Mon, 13 Nov 2006 09:37:02 -0800 From: "Kip Macy" To: "Pawel Jakub Dawidek" , "Kip Macy" , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org In-Reply-To: <20061113153029.GC25940@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200611130551.kAD5pNIP001371@repoman.freebsd.org> <20061113153029.GC25940@garage.freebsd.pl> Cc: Subject: Re: cvs commit: src/sys/coda coda_vnops.c coda_vnops.h src/sys/fs/nullfs null_vnops.c src/sys/kern vfs_default.c vfs_subr.c vfs_vnops.c vnode_if.src src/sys/sys vnode.h src/sys/ufs/ffs ffs_vnops.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Nov 2006 17:42:02 -0000 We can call it something else, but fundamentally it has to be wrapped by a macro - this is the convention for locks. You can change it to vop_lock_internal if you like. I On 11/13/06, Pawel Jakub Dawidek wrote: > On Mon, Nov 13, 2006 at 05:51:22AM +0000, Kip Macy wrote: > > kmacy 2006-11-13 05:51:22 UTC > > > > FreeBSD src repository > > > > Modified files: > > sys/coda coda_vnops.c coda_vnops.h > > sys/fs/nullfs null_vnops.c > > sys/kern vfs_default.c vfs_subr.c vfs_vnops.c > > vnode_if.src > > sys/sys vnode.h > > sys/ufs/ffs ffs_vnops.c > > Log: > > change vop_lock handling to allowing tracking of callers' file and line > for > > acquisition of lockmgr locks > [...] > > --- src/sys/coda/coda_vnops.c 2006/02/01 00:25:24 1.68 > > +++ src/sys/coda/coda_vnops.c 2006/11/13 05:51:21 1.69 > [...] > > .vop_reclaim = coda_reclaim, /* reclaim */ > > - .vop_lock = coda_lock, /* lock */ > > + ._vop_lock = coda_lock, /* lock */ > > .vop_unlock = coda_unlock, /* unlock */ > [...] > > --- src/sys/fs/nullfs/null_vnops.c 2006/03/12 04:58:18 1.91 > > +++ src/sys/fs/nullfs/null_vnops.c 2006/11/13 05:51:21 1.92 > [...] > > .vop_islocked = null_islocked, > > - .vop_lock = null_lock, > > + ._vop_lock = null_lock, > > .vop_lookup = null_lookup, > [...] > > --- src/sys/kern/vfs_default.c 2006/09/20 00:27:02 1.134 > > +++ src/sys/kern/vfs_default.c 2006/11/13 05:51:22 1.135 > [...] > > .vop_lease = VOP_NULL, > > - .vop_lock = vop_stdlock, > > + ._vop_lock = vop_stdlock, > > .vop_lookup = vop_nolookup, > [...] > > --- src/sys/kern/vfs_subr.c 2006/11/07 19:45:05 1.691 > > +++ src/sys/kern/vfs_subr.c 2006/11/13 05:51:22 1.692 > [...] > > .vop_reclaim = sync_reclaim, /* reclaim */ > > - .vop_lock = vop_stdlock, /* lock */ > > + ._vop_lock = vop_stdlock, /* lock */ > > .vop_unlock = vop_stdunlock, /* unlock */ > > --- src/sys/ufs/ffs/ffs_vnops.c 2006/11/06 13:42:09 1.162 > > +++ src/sys/ufs/ffs/ffs_vnops.c 2006/11/13 05:51:22 1.163 > [...] > > .vop_getpages = ffs_getpages, > > - .vop_lock = ffs_lock, > > + ._vop_lock = ffs_lock, > > .vop_read = ffs_read, > [...] > > .vop_getpages = ffs_getpages, > > - .vop_lock = ffs_lock, > > + ._vop_lock = ffs_lock, > > .vop_read = ffs_read, > [...] > > .vop_fsync = ffs_fsync, > > - .vop_lock = ffs_lock, > > + ._vop_lock = ffs_lock, > > .vop_reallocblks = ffs_reallocblks, > > Kip... This is so ugly... All the rest of vops don'y have this _ prefix. > There is really no other way to implement it? > > -- > Pawel Jakub Dawidek http://www.wheel.pl > pjd@FreeBSD.org http://www.FreeBSD.org > FreeBSD committer Am I Evil? Yes, I Am! > >