[src/netbsd-1-5]: src/sys Pullup from trunk (approved by thorpej):

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e42a044e4509
branches:  netbsd-1-5
changeset: 488817:e42a044e4509
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Jul 30 20:38:33 2000 +0000

description:
Pullup from trunk (approved by thorpej):
Change lf_advlock() to:
int      lf_advlock (struct vop_advlock_args *, struct lockf **, off_t)

This matches it's usage. Change inspired by FreeBSD, though we use
off_t instead u_quad_t as the last argument.

sys/lockf.h                     rev. 1.9
msdosfs/msdosfs_vnops.c         rev. 1.99
kern/vfs_lockf.c                rev. 1.17
miscfs/specfs/spec_vnops.c      rev. 1.49
nfs/nfs_vnops.c                 rev. 1.115
ufs/ext2fs/ext2fs_vnops.c       rev. 1.28
ufs/ufs/ufs_vnops.c             rev. 1.72

diffstat:

 sys/kern/vfs_lockf.c           |  18 ++++++++----------
 sys/miscfs/specfs/spec_vnops.c |   5 ++---
 sys/msdosfs/msdosfs_vnops.c    |   5 ++---
 sys/nfs/nfs_vnops.c            |   5 ++---
 sys/sys/lockf.h                |   5 ++---
 sys/ufs/ext2fs/ext2fs_vnops.c  |   5 ++---
 sys/ufs/ufs/ufs_vnops.c        |   5 ++---
 7 files changed, 20 insertions(+), 28 deletions(-)

diffs (168 lines):

diff -r 102800a00b00 -r e42a044e4509 sys/kern/vfs_lockf.c
--- a/sys/kern/vfs_lockf.c      Sun Jul 30 18:03:03 2000 +0000
+++ b/sys/kern/vfs_lockf.c      Sun Jul 30 20:38:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_lockf.c,v 1.16 2000/06/12 14:33:06 sommerfeld Exp $        */
+/*     $NetBSD: vfs_lockf.c,v 1.16.2.1 2000/07/30 20:38:51 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -86,14 +86,12 @@
  * Do an advisory lock operation.
  */
 int
-lf_advlock(head, size, id, op, fl, flags)
+lf_advlock(ap, head, size)
+       struct vop_advlock_args *ap;
        struct lockf **head;
        off_t size;
-       caddr_t id;
-       int op;
-       struct flock *fl;
-       int flags;
 {
+       struct flock *fl = ap->a_fl;
        struct lockf *lock;
        off_t start, end;
        int error;
@@ -125,7 +123,7 @@
         * Avoid the common case of unlocking when inode has no locks.
         */
        if (*head == (struct lockf *)0) {
-               if (op != F_SETLK) {
+               if (ap->a_op != F_SETLK) {
                        fl->l_type = F_UNLCK;
                        return (0);
                }
@@ -141,16 +139,16 @@
        MALLOC(lock, struct lockf *, sizeof(*lock), M_LOCKF, M_WAITOK);
        lock->lf_start = start;
        lock->lf_end = end;
-       lock->lf_id = id;
+       lock->lf_id = ap->a_id;
        lock->lf_head = head;
        lock->lf_type = fl->l_type;
        lock->lf_next = (struct lockf *)0;
        TAILQ_INIT(&lock->lf_blkhd);
-       lock->lf_flags = flags;
+       lock->lf_flags = ap->a_flags;
        /*
         * Do the requested operation.
         */
-       switch (op) {
+       switch (ap->a_op) {
 
        case F_SETLK:
                return (lf_setlock(lock));
diff -r 102800a00b00 -r e42a044e4509 sys/miscfs/specfs/spec_vnops.c
--- a/sys/miscfs/specfs/spec_vnops.c    Sun Jul 30 18:03:03 2000 +0000
+++ b/sys/miscfs/specfs/spec_vnops.c    Sun Jul 30 20:38:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spec_vnops.c,v 1.48 2000/03/30 12:22:14 augustss Exp $ */
+/*     $NetBSD: spec_vnops.c,v 1.48.4.1 2000/07/30 20:38:57 jdolecek Exp $     */
 
 /*
  * Copyright (c) 1989, 1993
@@ -730,6 +730,5 @@
        } */ *ap = v;
        struct vnode *vp = ap->a_vp;
 
-       return (lf_advlock(&vp->v_speclockf, (off_t)0, ap->a_id, ap->a_op,
-                          ap->a_fl, ap->a_flags));
+       return lf_advlock(ap, &vp->v_speclockf, (off_t)0);
 }
diff -r 102800a00b00 -r e42a044e4509 sys/msdosfs/msdosfs_vnops.c
--- a/sys/msdosfs/msdosfs_vnops.c       Sun Jul 30 18:03:03 2000 +0000
+++ b/sys/msdosfs/msdosfs_vnops.c       Sun Jul 30 20:38:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdosfs_vnops.c,v 1.97.4.2 2000/07/30 09:57:00 jdolecek Exp $  */
+/*     $NetBSD: msdosfs_vnops.c,v 1.97.4.3 2000/07/30 20:38:34 jdolecek Exp $  */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -1852,8 +1852,7 @@
        } */ *ap = v;
        struct denode *dep = VTODE(ap->a_vp);
 
-       return (lf_advlock(&dep->de_lockf, dep->de_FileSize, ap->a_id, ap->a_op,
-           ap->a_fl, ap->a_flags));
+       return lf_advlock(ap, &dep->de_lockf, dep->de_FileSize);
 }
 
 int
diff -r 102800a00b00 -r e42a044e4509 sys/nfs/nfs_vnops.c
--- a/sys/nfs/nfs_vnops.c       Sun Jul 30 18:03:03 2000 +0000
+++ b/sys/nfs/nfs_vnops.c       Sun Jul 30 20:38:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_vnops.c,v 1.113 2000/05/26 08:36:48 enami Exp $    */
+/*     $NetBSD: nfs_vnops.c,v 1.113.4.1 2000/07/30 20:38:57 jdolecek Exp $     */
 
 /*
  * Copyright (c) 1989, 1993
@@ -3051,8 +3051,7 @@
        } */ *ap = v;
        struct nfsnode *np = VTONFS(ap->a_vp);
 
-       return (lf_advlock(&np->n_lockf, np->n_size, ap->a_id, ap->a_op,
-           ap->a_fl, ap->a_flags));
+       return lf_advlock(ap, &np->n_lockf, np->n_size);
 }
 
 /*
diff -r 102800a00b00 -r e42a044e4509 sys/sys/lockf.h
--- a/sys/sys/lockf.h   Sun Jul 30 18:03:03 2000 +0000
+++ b/sys/sys/lockf.h   Sun Jul 30 20:38:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lockf.h,v 1.8 2000/06/12 14:33:04 sommerfeld Exp $     */
+/*     $NetBSD: lockf.h,v 1.8.2.1 2000/07/30 20:38:33 jdolecek Exp $   */
 
 /*
  * Copyright (c) 1991, 1993
@@ -73,8 +73,7 @@
 
 __BEGIN_DECLS
 void    lf_addblock __P((struct lockf *, struct lockf *));
-int     lf_advlock __P((struct lockf **,
-           off_t, caddr_t, int, struct flock *, int));
+int     lf_advlock __P((struct vop_advlock_args *, struct lockf **, off_t));
 int     lf_clearlock __P((struct lockf *));
 int     lf_findoverlap __P((struct lockf *,
            struct lockf *, int, struct lockf ***, struct lockf **));
diff -r 102800a00b00 -r e42a044e4509 sys/ufs/ext2fs/ext2fs_vnops.c
--- a/sys/ufs/ext2fs/ext2fs_vnops.c     Sun Jul 30 18:03:03 2000 +0000
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c     Sun Jul 30 20:38:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs_vnops.c,v 1.26 2000/05/13 23:43:13 perseant Exp $       */
+/*     $NetBSD: ext2fs_vnops.c,v 1.26.4.1 2000/07/30 20:38:59 jdolecek Exp $   */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -1257,8 +1257,7 @@
        } */ *ap = v;
        struct inode *ip = VTOI(ap->a_vp);
 
-       return (lf_advlock(&ip->i_lockf, ip->i_e2fs_size, ap->a_id, ap->a_op,
-           ap->a_fl, ap->a_flags));
+       return lf_advlock(ap, &ip->i_lockf, ip->i_e2fs_size);
 }
 
 /*
diff -r 102800a00b00 -r e42a044e4509 sys/ufs/ufs/ufs_vnops.c
--- a/sys/ufs/ufs/ufs_vnops.c   Sun Jul 30 18:03:03 2000 +0000
+++ b/sys/ufs/ufs/ufs_vnops.c   Sun Jul 30 20:38:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_vnops.c,v 1.68 2000/05/30 17:40:12 mycroft Exp $   */
+/*     $NetBSD: ufs_vnops.c,v 1.68.2.1 2000/07/30 20:39:00 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993, 1995
@@ -1882,8 +1882,7 @@
        } */ *ap = v;
        struct inode *ip = VTOI(ap->a_vp);
 
-       return (lf_advlock(&ip->i_lockf, ip->i_ffs_size, ap->a_id, ap->a_op,
-           ap->a_fl, ap->a_flags));
+       return lf_advlock(ap, &ip->i_lockf, ip->i_ffs_size);
 }
 
 /*