Mercurial > linux > xfs-patches

changeset 0:c4fbdb46d162

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
initial import
author Josef "Jeff" Sipek <sipekj@us.ibm.com>
date Wed, 25 Jul 2007 09:44:40 -0400
parents
children be7e3e4b76b7
files .hgignore rename-B_FS-flags save-xfs_buf_set_vtype_ref-value series version
diffstat 5 files changed, 191 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed Jul 25 09:44:40 2007 -0400
@@ -0,0 +1,2 @@
+^status$
+~$
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rename-B_FS-flags	Wed Jul 25 09:44:40 2007 -0400
@@ -0,0 +1,108 @@
+XFS: Rename B_FS_* flags to XFS_B_FS_*
+
+Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
+
+diff --git a/fs/xfs/quota/xfs_dquot.c b/fs/xfs/quota/xfs_dquot.c
+index cfdd35e..421ded6 100644
+--- a/fs/xfs/quota/xfs_dquot.c
++++ b/fs/xfs/quota/xfs_dquot.c
+@@ -679,7 +679,7 @@ xfs_qm_dqread(
+ 	dqp->q_res_rtbcount = be64_to_cpu(ddqp->d_rtbcount);
+ 
+ 	/* Mark the buf so that this will stay incore a little longer */
+-	XFS_BUF_SET_VTYPE_REF(bp, B_FS_DQUOT, XFS_DQUOT_REF);
++	XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_DQUOT, XFS_DQUOT_REF);
+ 
+ 	/*
+ 	 * We got the buffer with a xfs_trans_read_buf() (in dqtobp())
+diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
+index 012a649..7923fc7 100644
+--- a/fs/xfs/xfs_alloc.c
++++ b/fs/xfs/xfs_alloc.c
+@@ -409,7 +409,7 @@ xfs_alloc_read_agfl(
+ 		return error;
+ 	ASSERT(bp);
+ 	ASSERT(!XFS_BUF_GETERROR(bp));
+-	XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGFL, XFS_AGFL_REF);
++	XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_AGFL, XFS_AGFL_REF);
+ 	*bpp = bp;
+ 	return 0;
+ }
+@@ -2222,7 +2222,7 @@ xfs_alloc_read_agf(
+ 		       be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]));
+ 	}
+ #endif
+-	XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGF, XFS_AGF_REF);
++	XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_AGF, XFS_AGF_REF);
+ 	*bpp = bp;
+ 	return 0;
+ }
+diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
+index aeb87ca..0f67a42 100644
+--- a/fs/xfs/xfs_btree.c
++++ b/fs/xfs/xfs_btree.c
+@@ -760,7 +760,7 @@ xfs_btree_read_bufl(
+ 	}
+ 	ASSERT(!bp || !XFS_BUF_GETERROR(bp));
+ 	if (bp != NULL) {
+-		XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval);
++		XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_MAP, refval);
+ 	}
+ 	*bpp = bp;
+ 	return 0;
+@@ -795,10 +795,10 @@ xfs_btree_read_bufs(
+ 	if (bp != NULL) {
+ 		switch (refval) {
+ 		case XFS_ALLOC_BTREE_REF:
+-			XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval);
++			XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_MAP, refval);
+ 			break;
+ 		case XFS_INO_BTREE_REF:
+-			XFS_BUF_SET_VTYPE_REF(bp, B_FS_INOMAP, refval);
++			XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_INOMAP, refval);
+ 			break;
+ 		}
+ 	}
+diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
+index aea37df..62b8465 100644
+--- a/fs/xfs/xfs_da_btree.c
++++ b/fs/xfs/xfs_da_btree.c
+@@ -2037,10 +2037,10 @@ xfs_da_do_buf(
+ 			continue;
+ 		if (caller == 1) {
+ 			if (whichfork == XFS_ATTR_FORK) {
+-				XFS_BUF_SET_VTYPE_REF(bp, B_FS_ATTR_BTREE,
++				XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_ATTR_BTREE,
+ 						XFS_ATTR_BTREE_REF);
+ 			} else {
+-				XFS_BUF_SET_VTYPE_REF(bp, B_FS_DIR_BTREE,
++				XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_DIR_BTREE,
+ 						XFS_DIR_BTREE_REF);
+ 			}
+ 		}
+diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
+index f943368..a62b923 100644
+--- a/fs/xfs/xfs_ialloc.c
++++ b/fs/xfs/xfs_ialloc.c
+@@ -1408,7 +1408,7 @@ xfs_ialloc_read_agi(
+ 	}
+ #endif
+ 
+-	XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGI, XFS_AGI_REF);
++	XFS_BUF_SET_VTYPE_REF(bp, XFS_B_FS_AGI, XFS_AGI_REF);
+ 	*bpp = bp;
+ 	return 0;
+ }
+diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
+index cdc4c28..d2a66f5 100644
+--- a/fs/xfs/xfs_inode.c
++++ b/fs/xfs/xfs_inode.c
+@@ -375,7 +375,7 @@ xfs_itobp(
+ 	/*
+ 	 * Mark the buffer as an inode buffer now that it looks good
+ 	 */
+-	XFS_BUF_SET_VTYPE(bp, B_FS_INO);
++	XFS_BUF_SET_VTYPE(bp, XFS_B_FS_INO);
+ 
+ 	/*
+ 	 * Set *dipp to point to the on-disk inode in the buffer.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/save-xfs_buf_set_vtype_ref-value	Wed Jul 25 09:44:40 2007 -0400
@@ -0,0 +1,65 @@
+XFS: Save buffer type and references count
+
+Save values passed to XFS_BUF_SET_{VTYPE,REF,VTYPE_REF} inside the xfs_buf_t
+struct.
+
+Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
+
+diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
+index b5908a3..c9469f0 100644
+--- a/fs/xfs/linux-2.6/xfs_buf.h
++++ b/fs/xfs/linux-2.6/xfs_buf.h
+@@ -31,6 +31,19 @@
+  *	Base types
+  */
+ 
++typedef enum {
++	XFS_B_FS_NONE,
++	XFS_B_FS_INO,
++	XFS_B_FS_INOMAP,
++	XFS_B_FS_DIR_BTREE,
++	XFS_B_FS_MAP,
++	XFS_B_FS_ATTR_BTREE,
++	XFS_B_FS_AGI,
++	XFS_B_FS_AGF,
++	XFS_B_FS_AGFL,
++	XFS_B_FS_DQUOT
++} xfs_bvtype_t;
++
+ #define XFS_BUF_DADDR_NULL	((xfs_daddr_t) (-1LL))
+ 
+ #define xfs_buf_ctob(pp)	((pp) * PAGE_CACHE_SIZE)
+@@ -123,6 +136,8 @@ typedef struct xfs_buf {
+ 	atomic_t		b_pin_count;	/* pin count */
+ 	wait_queue_head_t	b_waiters;	/* unpin waiters */
+ 	struct list_head	b_list;
++	xfs_bvtype_t		b_type;		/* buffer type */
++	char			b_ref;		/* buffer reference */
+ 	xfs_buf_flags_t		b_flags;	/* status flags */
+ 	struct list_head	b_hash_list;	/* hash table list */
+ 	xfs_bufhash_t		*b_hash;	/* hash table list start */
+@@ -324,9 +339,21 @@ extern void xfs_buf_trace(xfs_buf_t *, char *, void *, void *);
+ #define XFS_BUF_SIZE(bp)		((bp)->b_buffer_length)
+ #define XFS_BUF_SET_SIZE(bp, cnt)	((bp)->b_buffer_length = (cnt))
+ 
+-#define XFS_BUF_SET_VTYPE_REF(bp, type, ref)	do { } while (0)
+-#define XFS_BUF_SET_VTYPE(bp, type)		do { } while (0)
+-#define XFS_BUF_SET_REF(bp, ref)		do { } while (0)
++static inline void XFS_BUF_SET_VTYPE_REF(xfs_buf_t *bp, xfs_bvtype_t type, char ref)
++{
++	bp->b_type = type;
++	bp->b_ref  = ref;
++}
++
++static inline void XFS_BUF_SET_VTYPE(xfs_buf_t *bp, xfs_bvtype_t type)
++{
++	bp->b_type = type;
++}
++
++static inline void XFS_BUF_SET_REF(xfs_buf_t *bp, char ref)
++{
++	bp->b_ref = ref;
++}
+ 
+ #define XFS_BUF_ISPINNED(bp)	xfs_buf_ispin(bp)
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/series	Wed Jul 25 09:44:40 2007 -0400
@@ -0,0 +1,3 @@
+version
+rename-B_FS-flags
+save-xfs_buf_set_vtype_ref-value
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/version	Wed Jul 25 09:44:40 2007 -0400
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 23f81c9..9707334 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 23
+-EXTRAVERSION =-rc1
++EXTRAVERSION = -rc1
+ NAME = Holy Dancing Manatees, Batman!
+ 
+ # *DOCUMENTATION*