bump minor version to pick up Erics BLKGETSIZE change from awhile ago and

sync userspace and kernel code up (minor changes only, doesn't affect user
tools at all).

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

diff --git a/debian/changelog b/debian/changelog
index dc6bd81aa69c3c757f1cd6baa4dd4f2792d604fb..1b439cab74e43633740f4a80548fe6c9d6587c75 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (2.0.1-1) unstable; urgency=low
+
+  * New upstream bugfix (minor) release
+
+ -- Nathan Scott <nathans@debian.org>  Tue, 12 Mar 2002 13:25:32 +1100
+
 xfsprogs (2.0.0-1) unstable; urgency=low
 
   * New upstream release with support for new libhandle interfaces

diff --git a/doc/CHANGES b/doc/CHANGES
index 6f563171eff4988f84d592a695ac866571206bce..bd58350899a05721d272321c77611bfa516d68fe 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,5 +1,6 @@
-cvs
+xfsprogs-2.0.1 (12 March 2002)
        - Fall back to BLKGETSIZE if BLKGETSIZE64 fails
+       - Sync user/kernel headers and shared code
 
 xfsprogs-2.0.0 (26 February 2002)
        - Major release to coincide with switch to new extended

diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
index 2390eb912d0a9467016c55f0fa601d7060580c71..9dbc8ee17f367260d78f3c522919c26f7ffa26a8 100644 (file)
--- a/include/platform_defs.h.in
+++ b/include/platform_defs.h.in
@@ -77,11 +77,19 @@ typedef char*               xfs_caddr_t;
 typedef unsigned char  uchar_t;
 
 /* long and pointer must be either 32 bit or 64 bit */
-#undef HAVE_64BIT_LONG
 #undef HAVE_32BIT_LONG
+#undef HAVE_64BIT_LONG
 #undef HAVE_32BIT_PTR
 #undef HAVE_64BIT_PTR
 
+#if defined(HAVE_32BIT_LONG)
+# define BITS_PER_LONG 32
+#elif defined(HAVE_64BIT_LONG)
+# define BITS_PER_LONG 64
+#else
+# error Unknown long size
+#endif
+
 /* Check if __psint_t is set to something meaningful */
 #undef HAVE___PSINT_T
 #ifndef HAVE___PSINT_T

diff --git a/include/xfs_ag.h b/include/xfs_ag.h
index 6b803af4370d956fcdc9d056e91c19d75258365a..5fd7dba118cc40b98c0d984774cd9fb1b077a476 100644 (file)
--- a/include/xfs_ag.h
+++ b/include/xfs_ag.h
@@ -225,9 +225,9 @@ typedef struct xfs_perag
        xfs_agino_t     pagi_freecount; /* number of free inodes */
 #ifdef __KERNEL__
        lock_t          pagb_lock;      /* lock for pagb_list */
+#endif
        int             pagb_count;     /* pagb slots in use */
        xfs_perag_busy_t *pagb_list;    /* unstable blocks */
-#endif
 } xfs_perag_t;
 
 #define        XFS_AG_MIN_BYTES        (1LL << 24)     /* 16 MB */

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 9cdcbc2c1e106af7bd2314749014357993a80959..897aa5761b1809d64db0a973e68f3cf3f4aafe67 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -366,13 +366,13 @@ libxfs_malloc(size_t size)
 {
        void    *ptr;
 
-       if ((ptr = malloc(size)) == NULL) {
-               fprintf(stderr, "%s: malloc failed (%d bytes): %s\n",
+       if ((ptr = calloc(1, size)) == NULL) {
+               fprintf(stderr, "%s: calloc failed (%d bytes): %s\n",
                        progname, (int)size, strerror(errno));
                exit(1);
        }
 #ifdef MEM_DEBUG
-       fprintf(stderr, "## malloc'd item %p size %d bytes\n", 
+       fprintf(stderr, "## calloc'd item %p size %d bytes\n", 
                 ptr, size);
 #endif
        return ptr;

diff --git a/libxfs/xfs.h b/libxfs/xfs.h
index a1ecf1415740e0115a38e0991cb0c42e114f6090..6d486b7e007a47a94b0334b188153085928364b6 100644 (file)
--- a/libxfs/xfs.h
+++ b/libxfs/xfs.h
@@ -192,6 +192,7 @@
 #define kmem_zone_zalloc(z, f) libxfs_zone_zalloc(z)
 #define kmem_zone_free(z, p)   libxfs_zone_free(z, p)
 #define kmem_realloc(p,sz,u,f) libxfs_realloc(p,sz)
+#define kmem_zalloc(size, f)   libxfs_malloc(size)
 #define kmem_alloc(size, f)    libxfs_malloc(size)
 #define kmem_free(p, size)     libxfs_free(p)
 
@@ -280,7 +281,7 @@ typedef struct { dev_t dev; } buftarg_t;
        __res; })
 
 #include <asm/page.h>
-#define NBPP   PAGE_SIZE
+#define NBPP           PAGE_SIZE
 
 static inline int atomicIncWithWrap(int *a, int b)
 {

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 28f3cab4d7eeb308f3d0342cd51500e7088d7091..28fe364ffafa6f08ea84ce8ce1a52e01d335ffee 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2151,6 +2151,8 @@ xfs_alloc_read_agf(
                pag->pagf_levels[XFS_BTNUM_CNTi] =
                        INT_GET(agf->agf_levels[XFS_BTNUM_CNTi], ARCH_CONVERT);
                spinlock_init(&pag->pagb_lock, "xfspagb");
+               pag->pagb_list = kmem_zalloc(XFS_PAGB_NUM_SLOTS *
+                                       sizeof(xfs_perag_busy_t), KM_SLEEP);
                pag->pagf_init = 1;
        }
 #ifdef DEBUG