bump minor version number.

diff --git a/VERSION b/VERSION
index bfa363efcff2adeaa4a0fee515308a8a223e3b66..d11b4e5d3f10a48c2505c06ffb977aaf98ca4604 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=1
 PKG_MINOR=2
-PKG_REVISION=0
+PKG_REVISION=1
 PKG_BUILD=0

diff --git a/debian/changelog b/debian/changelog
index c0a161ac43c46cee475ff9bde00d778bd0915667..7b5a8fc0119f5de309a44aae0a63ab917450c91a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xfsprogs (1.2.0) unstable; urgency=low
+xfsprogs (1.2.1) unstable; urgency=low
 
   * Support for group quota added
   * Stripe unit/stripe width extraction for MD devices
   * Added mkfs.xfs heuristics for size of internal log
+  * Sync up with recent changes to XFS kernel headers
 
- -- Nathan Scott <nathans@debian.org>  Sun,  1 Apr 2001 16:49:26 +1000
+ -- Nathan Scott <nathans@debian.org>  Wed,  4 Apr 2001 13:54:00 +1000
 
 xfsprogs (1.1.6) unstable; urgency=low
 

diff --git a/doc/CHANGES b/doc/CHANGES
index a55524cffe67482c792bb7b73eb271275b91dfa8..c28f8454380b791b10ab198b44496c7a23ba1d9e 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,7 @@
-xfsprogs-1.2.0 (1 April 2001)
+xfsprogs-1.2.1 (04 April 2001)
+       - sync up with recent changes to XFS kernel headers
+
+xfsprogs-1.2.0 (01 April 2001)
        - support for group quota added
        - some headers updated, in particular <xqm.h>
        - now in late stages of beta

diff --git a/include/xfs_btree.h b/include/xfs_btree.h
index 6f00a8c680e9f2578ba5b9e8806c9370041f5b12..02da28b80f714e03885f1cf6dba38a94cf625c80 100644 (file)
--- a/include/xfs_btree.h
+++ b/include/xfs_btree.h
@@ -453,10 +453,24 @@ xfs_btree_reada_bufs(
  * Bits in lr are set from XFS_BTCUR_{LEFT,RIGHT}RA.
  */
 int                                    /* readahead block count */
-xfs_btree_readahead(
+xfs_btree_readahead_core(
        xfs_btree_cur_t         *cur,   /* btree cursor */
        int                     lev,    /* level in btree */
        int                     lr);    /* left/right bits */
+
+static inline int                      /* readahead block count */
+xfs_btree_readahead(
+       xfs_btree_cur_t         *cur,   /* btree cursor */
+       int                     lev,    /* level in btree */
+       int                     lr)     /* left/right bits */
+{
+        if ((cur->bc_ra[lev] | lr) == cur->bc_ra[lev])
+                return 0;
+
+       return xfs_btree_readahead_core(cur, lev, lr);
+}
+
+
 /*
  * Set the buffer for level "lev" in the cursor to bp, releasing
  * any previous buffer.

diff --git a/libxfs/xfs.h b/libxfs/xfs.h
index cbf07f3c9bfc3302b1e2719b1036e03a3cdb55ef..7ed0b8e071d603a59a1f0bfe7983e2090661ac43 100644 (file)
--- a/libxfs/xfs.h
+++ b/libxfs/xfs.h
@@ -338,12 +338,19 @@ xfs_btree_cur_t *xfs_btree_init_cursor (xfs_mount_t *, xfs_trans_t *,
 int  xfs_btree_islastblock (xfs_btree_cur_t *, int);
 int  xfs_btree_lastrec (xfs_btree_cur_t *, int);
 void xfs_btree_offsets (__int64_t, const short *, int, int *, int *);
-int  xfs_btree_readahead (xfs_btree_cur_t *, int, int);
 void xfs_btree_setbuf (xfs_btree_cur_t *, int, xfs_buf_t *);
 int  xfs_btree_read_bufs (xfs_mount_t *, xfs_trans_t *, xfs_agnumber_t,
                        xfs_agblock_t, uint, xfs_buf_t **, int);
 int  xfs_btree_read_bufl (xfs_mount_t *, xfs_trans_t *, xfs_fsblock_t,
                        uint, xfs_buf_t **, int);
+int  xfs_btree_readahead_core (xfs_btree_cur_t *, int, int);
+static inline int xfs_btree_readahead (xfs_btree_cur_t *cur, int lev, int lr)
+{
+       if ((cur->bc_ra[lev] | lr) == cur->bc_ra[lev])
+               return 0;
+       return xfs_btree_readahead_core(cur, lev, lr);
+}
+
 
 /* xfs_inode.c */
 int  xfs_ialloc (xfs_trans_t *, xfs_inode_t *, mode_t, nlink_t, dev_t, cred_t *,

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 73cdd9ccdcb21d8acb8117dc15bb86a188170777..bbb06dbb246127a236f4169a6d88f052844848d4 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -795,7 +795,7 @@ xfs_btree_read_bufs(
  * Bits in lr are set from XFS_BTCUR_{LEFT,RIGHT}RA.
  */
 int
-xfs_btree_readahead(
+xfs_btree_readahead_core(
        xfs_btree_cur_t         *cur,           /* btree cursor */
        int                     lev,            /* level in btree */
        int                     lr)             /* left/right bits */
@@ -806,8 +806,6 @@ xfs_btree_readahead(
        int                     rval = 0;
 
        ASSERT(cur->bc_bufs[lev] != NULL);
-       if ((cur->bc_ra[lev] | lr) == cur->bc_ra[lev])
-               return 0;
        cur->bc_ra[lev] |= lr;
        switch (cur->bc_btnum) {
        case XFS_BTNUM_BNO: