[src/trunk]: src/sys/fs/smbfs SMB lock ids apparently are 16bit items. And th...

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

details:   https://anonhg.NetBSD.org/src/rev/2c98a6c71cdc
branches:  trunk
changeset: 543213:2c98a6c71cdc
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Feb 19 12:44:47 2003 +0000

description:
SMB lock ids apparently are 16bit items. And the code uses id 1 always.
No need to cast it back and forth to a caddr_t and u_int32_t - which does
not work well on 64bit archs.

diffstat:

 sys/fs/smbfs/smbfs_smb.c   |  6 +++---
 sys/fs/smbfs/smbfs_subr.h  |  4 ++--
 sys/fs/smbfs/smbfs_vnops.c |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 05ab95d84a57 -r 2c98a6c71cdc sys/fs/smbfs/smbfs_smb.c
--- a/sys/fs/smbfs/smbfs_smb.c  Wed Feb 19 12:22:51 2003 +0000
+++ b/sys/fs/smbfs/smbfs_smb.c  Wed Feb 19 12:44:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_smb.c,v 1.3 2003/02/18 12:52:34 jdolecek Exp $   */
+/*     $NetBSD: smbfs_smb.c,v 1.4 2003/02/19 12:44:47 martin Exp $     */
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -127,7 +127,7 @@
 }
 
 int
-smbfs_smb_lock(struct smbnode *np, int op, caddr_t id,
+smbfs_smb_lock(struct smbnode *np, int op, int id,
        off_t start, off_t end, struct smb_cred *scred)
 {
        struct smb_share *ssp = np->n_mount->sm_share;
@@ -138,7 +138,7 @@
                 */
                return EINVAL;
        else
-               return smbfs_smb_lockandx(np, op, (u_int32_t)id, start, end, scred);
+               return smbfs_smb_lockandx(np, op, id, start, end, scred);
 }
 
 int
diff -r 05ab95d84a57 -r 2c98a6c71cdc sys/fs/smbfs/smbfs_subr.h
--- a/sys/fs/smbfs/smbfs_subr.h Wed Feb 19 12:22:51 2003 +0000
+++ b/sys/fs/smbfs/smbfs_subr.h Wed Feb 19 12:44:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_subr.h,v 1.2 2002/01/09 17:43:28 deberg Exp $    */
+/*     $NetBSD: smbfs_subr.h,v 1.3 2003/02/19 12:44:47 martin Exp $    */
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -134,7 +134,7 @@
 /*
  * smb level
  */
-int  smbfs_smb_lock(struct smbnode *np, int op, caddr_t id,
+int  smbfs_smb_lock(struct smbnode *np, int op, int id,
        off_t start, off_t end, struct smb_cred *scred);
 int  smbfs_smb_statfs2(struct smb_share *ssp, struct statfs *sbp,
        struct smb_cred *scred);
diff -r 05ab95d84a57 -r 2c98a6c71cdc sys/fs/smbfs/smbfs_vnops.c
--- a/sys/fs/smbfs/smbfs_vnops.c        Wed Feb 19 12:22:51 2003 +0000
+++ b/sys/fs/smbfs/smbfs_vnops.c        Wed Feb 19 12:44:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_vnops.c,v 1.3 2003/02/18 20:07:50 jdolecek Exp $ */
+/*     $NetBSD: smbfs_vnops.c,v 1.4 2003/02/19 12:44:47 martin Exp $   */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -1047,7 +1047,7 @@
        struct vnode *vp = ap->a_vp;
        struct smbnode *np = VTOSMB(vp);
        struct flock *fl = ap->a_fl;
-       caddr_t id = (caddr_t)1 /* ap->a_id */;
+       int id = 1 /* ap->a_id */;
 /*     int flags = ap->a_flags;*/
        struct proc *p = curproc;
        struct smb_cred scred;