push 1.1.5 into unstable.

diff --git a/debian/changelog b/debian/changelog
index 7d86cd68debe1846b4a1d7a22a157663a25d4a5e..d29c269049d86c77434eb1775c478d48251c3a1c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xfsprogs (1.1.5) unstable; urgency=low
+
+  * Upgraded LVM stripe unit/width support to 0.9beta2 (IOP 10)
+  * Kernel now supports O_DIRECT - re-enable its use in xfs_mkfile
+  * BLKSETSIZE ioctl replaced by BLKBSZSET ioctl in libxfs
+  * libxfs_init extended so only mkfs and xfs_repair use BLKBSZSET
+  * NOTE: this requires an XFS kernel from 9 March '01 or later
+
+ -- Nathan Scott <nathans@debian.org>  Sun, 18 Mar 2001 14:31:17 +1100
+
 xfsprogs (1.1.3) unstable; urgency=low
 
   * Minor changes to xfs_logprint tail verification

diff --git a/include/xfs_dir2.h b/include/xfs_dir2.h
index f723933e1110509e779360c282f0d4ceb2ea8cfd..a0aa60f515c09888e5ad6c07eee2106ffd2358a5 100644 (file)
--- a/include/xfs_dir2.h
+++ b/include/xfs_dir2.h
@@ -85,7 +85,6 @@ typedef struct xfs_dir2_put_args {
        int             done;           /* output: set if value was stored */
        xfs_dir2_put_t  put;            /* put function ptr (i/o) */
        struct uio      *uio;           /* uio control structure */
-       unsigned char   type;           /* file type (see include/linux/fs.h) */
 } xfs_dir2_put_args_t;
 
 #define        XFS_DIR_IS_V2(mp)       ((mp)->m_dirversion == 2)

diff --git a/include/xfs_dir_leaf.h b/include/xfs_dir_leaf.h
index d330ff8ec284843e4b74295a61aafb83734512d5..f8bf1b5766968a9d072b61b04e8cb5959dadb2b9 100644 (file)
--- a/include/xfs_dir_leaf.h
+++ b/include/xfs_dir_leaf.h
@@ -156,7 +156,6 @@ typedef struct xfs_dir_put_args
        int             done;           /* output: set if value was stored */
        xfs_dir_put_t   put;            /* put function ptr (i/o) */
        struct uio      *uio;           /* uio control structure */
-       unsigned char   type;           /* file type (see include/linux/fs.h) */
 } xfs_dir_put_args_t;
 
 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR_LEAF_ENTSIZE_BYNAME)