summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-07-04 06:10:51 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-07-04 06:10:51 +0000
commitb66867809624d4365a3564c777611611b56a81f1 (patch)
tree1b685d6ef3bccff26e399bca45a4b89172a41fde
parent4d355b33fa579a2ea2bce9275b63fc6ec13b09ee (diff)
Move the declaration of inode_vtbl to after the inode declaration
itself -- gets rid of some compilation warnings in userland. ok csapuntz@
-rw-r--r--sys/ufs/ufs/inode.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 2963f50748d..5665b276a0f 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: inode.h,v 1.15 2001/06/23 02:07:56 csapuntz Exp $ */
+/* $OpenBSD: inode.h,v 1.16 2001/07/04 06:10:50 angelos Exp $ */
/* $NetBSD: inode.h,v 1.8 1995/06/15 23:22:50 cgd Exp $ */
/*
@@ -56,20 +56,6 @@ struct ext2fs_inode_ext {
ufs_daddr_t ext2fs_last_blk; /* last block allocated on disk */
};
-struct inode_vtbl {
- int (* iv_truncate)(struct inode *, off_t, int,
- struct ucred *);
- int (* iv_update)(struct inode *, struct timespec *, struct timespec *,
- int waitfor);
- int (* iv_inode_alloc)(struct inode *, int mode,
- struct ucred *, struct vnode **);
- int (* iv_inode_free)(struct inode *, ino_t ino, int mode);
- int (* iv_buf_alloc)(struct inode *, off_t, int, struct ucred *,
- int, struct buf **);
- int (* iv_bufatoff)(struct inode *, off_t offset, char **res,
- struct buf **bpp);
-} *vtbl;
-
/*
* The inode is used to describe each active (or recently active) file in the
* UFS filesystem. It is composed of two types of information. The first part
@@ -133,6 +119,20 @@ struct inode {
struct inode_vtbl *i_vtbl;
};
+struct inode_vtbl {
+ int (* iv_truncate)(struct inode *, off_t, int,
+ struct ucred *);
+ int (* iv_update)(struct inode *, struct timespec *, struct timespec *,
+ int waitfor);
+ int (* iv_inode_alloc)(struct inode *, int mode,
+ struct ucred *, struct vnode **);
+ int (* iv_inode_free)(struct inode *, ino_t ino, int mode);
+ int (* iv_buf_alloc)(struct inode *, off_t, int, struct ucred *,
+ int, struct buf **);
+ int (* iv_bufatoff)(struct inode *, off_t offset, char **res,
+ struct buf **bpp);
+};
+
#define UFS_TRUNCATE(ip, off, flags, cred) \
((ip)->i_vtbl->iv_truncate)((ip), (off), (flags), (cred))