From ee827fcade90603b5ad7f7f08220d911a6bf7d55 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 5 May 2005 13:26:18 -0700 Subject: [PATCH] --- yaml --- r: 934 b: refs/heads/master c: 9effd8e62570c6e47b91734770e6122002c33ed5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/xfs/Makefile | 2 +- trunk/fs/xfs/linux-2.6/xfs_vnode.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0adb9be30251..f3e784f49c9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31b084aef3f088962f56c100b31bb8479c5dd769 +refs/heads/master: 9effd8e62570c6e47b91734770e6122002c33ed5 diff --git a/trunk/fs/xfs/Makefile b/trunk/fs/xfs/Makefile index 554e4a18c152..d3ff78354638 100644 --- a/trunk/fs/xfs/Makefile +++ b/trunk/fs/xfs/Makefile @@ -49,7 +49,7 @@ ifeq ($(CONFIG_XFS_TRACE),y) EXTRA_CFLAGS += -DXFS_LOG_TRACE EXTRA_CFLAGS += -DXFS_RW_TRACE EXTRA_CFLAGS += -DPAGEBUF_TRACE - # EXTRA_CFLAGS += -DXFS_VNODE_TRACE + EXTRA_CFLAGS += -DXFS_VNODE_TRACE endif obj-$(CONFIG_XFS_FS) += xfs.o diff --git a/trunk/fs/xfs/linux-2.6/xfs_vnode.h b/trunk/fs/xfs/linux-2.6/xfs_vnode.h index 7cff0f3e9bc3..3b40c929544e 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_vnode.h +++ b/trunk/fs/xfs/linux-2.6/xfs_vnode.h @@ -86,10 +86,11 @@ typedef struct vnode { vnumber_t v_number; /* in-core vnode number */ vn_bhv_head_t v_bh; /* behavior head */ spinlock_t v_lock; /* VN_LOCK/VN_UNLOCK */ - struct inode v_inode; /* Linux inode */ #ifdef XFS_VNODE_TRACE struct ktrace *v_trace; /* trace header structure */ #endif + struct inode v_inode; /* Linux inode */ + /* inode MUST be last */ } vnode_t; #define v_fbhv v_bh.bh_first /* first behavior */