define doff_t for size of directory offsets

SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.83
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.83
SCCS-vsn: sys/ufs/ffs/ufs_extern.h 7.4
SCCS-vsn: sys/ufs/ufs/ufs_extern.h 7.4

diff --git a/usr/src/sys/ufs/ffs/ufs_extern.h b/usr/src/sys/ufs/ffs/ufs_extern.h
index 51bdcd9..d907897 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_extern.h
+++ b/usr/src/sys/ufs/ffs/ufs_extern.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_extern.h        7.3 (Berkeley) %G%
+ *     @(#)ufs_extern.h        7.4 (Berkeley) %G%

  */
 
 struct buf;
  */
 
 struct buf;


@@ -40,7 +40,7 @@ int    ufs_chown __P((struct vnode *, u_int, u_int, struct proc *));
 int     ufs_close __P((struct vnode *, int, struct ucred *, struct proc *));
 int     ufs_create __P((struct vnode *, struct vnode **,
                         struct componentname *, struct vattr *));
 int     ufs_close __P((struct vnode *, int, struct ucred *, struct proc *));
 int     ufs_create __P((struct vnode *, struct vnode **,
                         struct componentname *, struct vattr *));

-void    ufs_dirbad __P((struct inode *, off_t, char *));
+void    ufs_dirbad __P((struct inode *, doff_t, char *));

 int     ufs_dirbadentry __P((struct direct *, int));
 int     ufs_dirempty __P((struct inode *, ino_t, struct ucred *));
 int     ufs_direnter __P((struct inode *, struct vnode *,struct componentname *));
 int     ufs_dirbadentry __P((struct direct *, int));
 int     ufs_dirempty __P((struct inode *, ino_t, struct ucred *));
 int     ufs_direnter __P((struct inode *, struct vnode *,struct componentname *));

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index c44b31d..7e2ea76 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.82 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.83 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1040,7 +1040,7 @@ unlinkit:
                                if (dirbuf.dotdot_namlen != 2 ||
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {
                                if (dirbuf.dotdot_namlen != 2 ||
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {

-                                       ufs_dirbad(xp, 12,
+                                       ufs_dirbad(xp, (doff_t)12,

                                            "rename: mangled dir");
                                } else {
                                        dirbuf.dotdot_ino = newparent;
                                            "rename: mangled dir");
                                } else {
                                        dirbuf.dotdot_ino = newparent;

diff --git a/usr/src/sys/ufs/ufs/ufs_extern.h b/usr/src/sys/ufs/ufs/ufs_extern.h
index 51bdcd9..d907897 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_extern.h
+++ b/usr/src/sys/ufs/ufs/ufs_extern.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_extern.h        7.3 (Berkeley) %G%
+ *     @(#)ufs_extern.h        7.4 (Berkeley) %G%

  */
 
 struct buf;
  */
 
 struct buf;


@@ -40,7 +40,7 @@ int    ufs_chown __P((struct vnode *, u_int, u_int, struct proc *));
 int     ufs_close __P((struct vnode *, int, struct ucred *, struct proc *));
 int     ufs_create __P((struct vnode *, struct vnode **,
                         struct componentname *, struct vattr *));
 int     ufs_close __P((struct vnode *, int, struct ucred *, struct proc *));
 int     ufs_create __P((struct vnode *, struct vnode **,
                         struct componentname *, struct vattr *));

-void    ufs_dirbad __P((struct inode *, off_t, char *));
+void    ufs_dirbad __P((struct inode *, doff_t, char *));

 int     ufs_dirbadentry __P((struct direct *, int));
 int     ufs_dirempty __P((struct inode *, ino_t, struct ucred *));
 int     ufs_direnter __P((struct inode *, struct vnode *,struct componentname *));
 int     ufs_dirbadentry __P((struct direct *, int));
 int     ufs_dirempty __P((struct inode *, ino_t, struct ucred *));
 int     ufs_direnter __P((struct inode *, struct vnode *,struct componentname *));

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index c44b31d..7e2ea76 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.82 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.83 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1040,7 +1040,7 @@ unlinkit:
                                if (dirbuf.dotdot_namlen != 2 ||
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {
                                if (dirbuf.dotdot_namlen != 2 ||
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {

-                                       ufs_dirbad(xp, 12,
+                                       ufs_dirbad(xp, (doff_t)12,

                                            "rename: mangled dir");
                                } else {
                                        dirbuf.dotdot_ino = newparent;
                                            "rename: mangled dir");
                                } else {
                                        dirbuf.dotdot_ino = newparent;