Source-Changes-HG archive

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

[src/trunk]: src/sys/ufs/lfs Fix some exposed symbols:



details:   https://anonhg.NetBSD.org/src/rev/a5154f2658a3
branches:  trunk
changeset: 787206:a5154f2658a3
user:      dholland <dholland%NetBSD.org@localhost>
date:      Thu Jun 06 00:52:14 2013 +0000

description:
Fix some exposed symbols:
   LOSTFOUNDINO -> LFS_LOSTFOUNDINO
   struct ufid -> struct ulfs_ufid

diffstat:

 sys/ufs/lfs/lfs.h         |  8 ++++----
 sys/ufs/lfs/ulfs_extern.h |  6 +++---
 sys/ufs/lfs/ulfs_vfsops.c |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r ea898c6af842 -r a5154f2658a3 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Thu Jun 06 00:51:50 2013 +0000
+++ b/sys/ufs/lfs/lfs.h Thu Jun 06 00:52:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs.h,v 1.140 2013/06/06 00:51:50 dholland Exp $       */
+/*     $NetBSD: lfs.h,v 1.141 2013/06/06 00:52:14 dholland Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
 #define        LFS_UNUSED_INUM 0               /* 0: out of band inode number */
 #define        LFS_IFILE_INUM  1               /* 1: IFILE inode number */
                                        /* 2: Root inode number */
-#define        LOSTFOUNDINO    3               /* 3: lost+found inode number */
+#define        LFS_LOSTFOUNDINO 3              /* 3: lost+found inode number */
 #define        LFS_FIRST_INUM  4               /* 4: first free inode number */
 
 #define        LFS_V1_SUMMARY_SIZE     512     /* V1 fixed summary size */
@@ -297,7 +297,7 @@
 
 #ifdef _KERNEL
 /* This overlays the fid structure (see fstypes.h). */
-struct ufid {
+struct ulfs_ufid {
        u_int16_t ufid_len;     /* Length of structure. */
        u_int16_t ufid_pad;     /* Force 32-bit alignment. */
        u_int32_t ufid_ino;     /* File number (ino). */
@@ -305,7 +305,7 @@
 };
 /* Filehandle structure for exported LFSes */
 struct lfid {
-       struct ufid lfid_ufid;
+       struct ulfs_ufid lfid_ufid;
 #define lfid_len lfid_ufid.ufid_len
 #define lfid_ino lfid_ufid.ufid_ino
 #define lfid_gen lfid_ufid.ufid_gen
diff -r ea898c6af842 -r a5154f2658a3 sys/ufs/lfs/ulfs_extern.h
--- a/sys/ufs/lfs/ulfs_extern.h Thu Jun 06 00:51:50 2013 +0000
+++ b/sys/ufs/lfs/ulfs_extern.h Thu Jun 06 00:52:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_extern.h,v 1.4 2013/06/06 00:50:51 dholland Exp $ */
+/*     $NetBSD: ulfs_extern.h,v 1.5 2013/06/06 00:52:14 dholland Exp $ */
 /*  from NetBSD: ufs_extern.h,v 1.72 2012/05/09 00:21:18 riastradh Exp  */
 
 /*-
@@ -50,7 +50,7 @@
 struct mount;
 struct nameidata;
 struct lwp;
-struct ufid;
+struct ulfs_ufid;
 struct ulfs_args;
 struct ulfs_lookup_results;
 struct ulfsmount;
@@ -190,7 +190,7 @@
 int    ulfs_start(struct mount *, int);
 int    ulfs_root(struct mount *, struct vnode **);
 int    ulfs_quotactl(struct mount *, struct quotactl_args *);
-int    ulfs_fhtovp(struct mount *, struct ufid *, struct vnode **);
+int    ulfs_fhtovp(struct mount *, struct ulfs_ufid *, struct vnode **);
 
 /* ulfs_vnops.c */
 void   ulfs_vinit(struct mount *, int (**)(void *),
diff -r ea898c6af842 -r a5154f2658a3 sys/ufs/lfs/ulfs_vfsops.c
--- a/sys/ufs/lfs/ulfs_vfsops.c Thu Jun 06 00:51:50 2013 +0000
+++ b/sys/ufs/lfs/ulfs_vfsops.c Thu Jun 06 00:52:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_vfsops.c,v 1.6 2013/06/06 00:51:50 dholland Exp $ */
+/*     $NetBSD: ulfs_vfsops.c,v 1.7 2013/06/06 00:52:14 dholland Exp $ */
 /*  from NetBSD: ufs_vfsops.c,v 1.52 2013/01/22 09:39:18 dholland Exp  */
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.6 2013/06/06 00:51:50 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.7 2013/06/06 00:52:14 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
@@ -214,7 +214,7 @@
  * filesystem has validated the file handle.
  */
 int
-ulfs_fhtovp(struct mount *mp, struct ufid *ufhp, struct vnode **vpp)
+ulfs_fhtovp(struct mount *mp, struct ulfs_ufid *ufhp, struct vnode **vpp)
 {
        struct vnode *nvp;
        struct inode *ip;



Home | Main Index | Thread Index | Old Index