Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src change smbfs_args:



details:   https://anonhg.NetBSD.org/src/rev/7e2df4e1f851
branches:  trunk
changeset: 543363:7e2df4e1f851
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Feb 23 22:31:17 2003 +0000

description:
change smbfs_args:
* g/c unused members 'mount_point', 'root_path', which only take space
* rename 'dev' to 'dev_fd' to more closely match what it is
* add 'export' member to avoid changing this again if ever smbfs would
  be made exportable

bump SMBFS_VERMIN - ABI/API change; mount_smbfs needs to be recompiled
to work again

diffstat:

 dist/smbfs/mount_smbfs/mount_smbfs.c |  4 ++--
 sys/fs/smbfs/smbfs.h                 |  9 ++++-----
 sys/fs/smbfs/smbfs_vfsops.c          |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r 014226dbce51 -r 7e2df4e1f851 dist/smbfs/mount_smbfs/mount_smbfs.c
--- a/dist/smbfs/mount_smbfs/mount_smbfs.c      Sun Feb 23 22:30:46 2003 +0000
+++ b/dist/smbfs/mount_smbfs/mount_smbfs.c      Sun Feb 23 22:31:17 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_smbfs.c,v 1.3 2003/02/23 22:14:09 jdolecek Exp $ */
+/* $NetBSD: mount_smbfs.c,v 1.4 2003/02/23 22:31:18 jdolecek Exp $ */
 
 /*
  * Copyright (c) 2000-2002, Boris Popov
@@ -232,7 +232,7 @@
                exit(1);
        }
        mdata.version = SMBFS_VERSION;
-       mdata.dev = ctx->ct_fd;
+       mdata.dev_fd = ctx->ct_fd;
        mdata.caseopt = caseopt;
        error = mount(SMBFS_VFSNAME, mount_point, mntflags, (void*)&mdata);
        smb_ctx_done(ctx);
diff -r 014226dbce51 -r 7e2df4e1f851 sys/fs/smbfs/smbfs.h
--- a/sys/fs/smbfs/smbfs.h      Sun Feb 23 22:30:46 2003 +0000
+++ b/sys/fs/smbfs/smbfs.h      Sun Feb 23 22:31:17 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs.h,v 1.2 2002/01/09 17:43:28 deberg Exp $ */
+/*     $NetBSD: smbfs.h,v 1.3 2003/02/23 22:31:17 jdolecek Exp $       */
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -37,7 +37,7 @@
 #define _SMBFS_SMBFS_H_
 
 #define SMBFS_VERMAJ   1
-#define SMBFS_VERMIN   1012
+#define SMBFS_VERMIN   1013
 #define SMBFS_VERSION  (SMBFS_VERMAJ*100000 + SMBFS_VERMIN)
 #define        SMBFS_VFSNAME   "smbfs"
 
@@ -54,15 +54,14 @@
 /* Layout of the mount control block for a netware file system. */
 struct smbfs_args {
        int             version;
-       int             dev;
+       int             dev_fd;         /* descriptor of open nsmb device */
        u_int           flags;
-       char            mount_point[MAXPATHLEN];
-       u_char          root_path[512+1];
        uid_t           uid;
        gid_t           gid;
        mode_t          file_mode;
        mode_t          dir_mode;
        int             caseopt;
+       struct  export_args export;     /* network export information */
 };
 
 #ifdef _KERNEL
diff -r 014226dbce51 -r 7e2df4e1f851 sys/fs/smbfs/smbfs_vfsops.c
--- a/sys/fs/smbfs/smbfs_vfsops.c       Sun Feb 23 22:30:46 2003 +0000
+++ b/sys/fs/smbfs/smbfs_vfsops.c       Sun Feb 23 22:31:17 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_vfsops.c,v 1.13 2003/02/23 22:20:05 jdolecek Exp $       */
+/*     $NetBSD: smbfs_vfsops.c,v 1.14 2003/02/23 22:31:17 jdolecek Exp $       */
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -143,7 +143,7 @@
                return EINVAL;
        }
        smb_makescred(&scred, p, p->p_ucred);
-       error = smb_dev2share(args.dev, SMBM_EXEC, &scred, &ssp);
+       error = smb_dev2share(args.dev_fd, SMBM_EXEC, &scred, &ssp);
        if (error)
                return error;
        smb_share_unlock(ssp, 0);



Home | Main Index | Thread Index | Old Index