11 files changed, 249 insertions, 165 deletions
diff --git a/fs/xfs/Kbuild b/fs/xfs/Kbuild
deleted file mode 100644
index 2566e96706f1..000000000000
--- a/fs/xfs/Kbuild
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# The xfs people like to share Makefile with 2.6 and 2.4.
-# Utilise file named Kbuild file which has precedence over Makefile.
-#
-include $(srctree)/$(obj)/Makefile-linux-2.6
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 49e3e7e5e3dc..36ec614e699a 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -1 +1,117 @@
-include $(TOPDIR)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL)
+#
+# Copyright (c) 2000-2005 Silicon Graphics, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+EXTRA_CFLAGS +=  -I$(src) -I$(src)/linux-2.6 -funsigned-char
+XFS_LINUX := linux-2.6
+ifeq ($(CONFIG_XFS_DEBUG),y)
+        EXTRA_CFLAGS += -g
+endif
+obj-$(CONFIG_XFS_FS)            += xfs.o
+xfs-$(CONFIG_XFS_QUOTA)         += $(addprefix quota/, \
+                                   xfs_dquot.o \
+                                   xfs_dquot_item.o \
+                                   xfs_trans_dquot.o \
+                                   xfs_qm_syscalls.o \
+                                   xfs_qm_bhv.o \
+                                   xfs_qm.o)
+ifeq ($(CONFIG_XFS_QUOTA),y)
+xfs-$(CONFIG_PROC_FS)           += quota/xfs_qm_stats.o
+endif
+xfs-$(CONFIG_XFS_RT)            += xfs_rtalloc.o
+xfs-$(CONFIG_XFS_POSIX_ACL)     += xfs_acl.o
+xfs-$(CONFIG_PROC_FS)           += $(XFS_LINUX)/xfs_stats.o
+xfs-$(CONFIG_SYSCTL)            += $(XFS_LINUX)/xfs_sysctl.o
+xfs-$(CONFIG_COMPAT)            += $(XFS_LINUX)/xfs_ioctl32.o
+xfs-y                           += xfs_alloc.o \
+                                   xfs_alloc_btree.o \
+                                   xfs_attr.o \
+                                   xfs_attr_leaf.o \
+                                   xfs_bit.o \
+                                   xfs_bmap.o \
+                                   xfs_bmap_btree.o \
+                                   xfs_btree.o \
+                                   xfs_buf_item.o \
+                                   xfs_da_btree.o \
+                                   xfs_dir2.o \
+                                   xfs_dir2_block.o \
+                                   xfs_dir2_data.o \
+                                   xfs_dir2_leaf.o \
+                                   xfs_dir2_node.o \
+                                   xfs_dir2_sf.o \
+                                   xfs_error.o \
+                                   xfs_extfree_item.o \
+                                   xfs_filestream.o \
+                                   xfs_fsops.o \
+                                   xfs_ialloc.o \
+                                   xfs_ialloc_btree.o \
+                                   xfs_iget.o \
+                                   xfs_inode.o \
+                                   xfs_inode_item.o \
+                                   xfs_iomap.o \
+                                   xfs_itable.o \
+                                   xfs_dfrag.o \
+                                   xfs_log.o \
+                                   xfs_log_recover.o \
+                                   xfs_mount.o \
+                                   xfs_mru_cache.o \
+                                   xfs_rename.o \
+                                   xfs_trans.o \
+                                   xfs_trans_ail.o \
+                                   xfs_trans_buf.o \
+                                   xfs_trans_extfree.o \
+                                   xfs_trans_inode.o \
+                                   xfs_trans_item.o \
+                                   xfs_utils.o \
+                                   xfs_vfsops.o \
+                                   xfs_vnodeops.o \
+                                   xfs_rw.o \
+                                   xfs_dmops.o \
+                                   xfs_qmops.o
+xfs-$(CONFIG_XFS_TRACE)         += xfs_dir2_trace.o
+# Objects in linux/
+xfs-y                           += $(addprefix $(XFS_LINUX)/, \
+                                   kmem.o \
+                                   xfs_aops.o \
+                                   xfs_buf.o \
+                                   xfs_export.o \
+                                   xfs_file.o \
+                                   xfs_fs_subr.o \
+                                   xfs_globals.o \
+                                   xfs_ioctl.o \
+                                   xfs_iops.o \
+                                   xfs_lrw.o \
+                                   xfs_super.o \
+                                   xfs_vnode.o)
+# Objects in support/
+xfs-y                           += $(addprefix support/, \
+                                   debug.o \
+                                   uuid.o)
+xfs-$(CONFIG_XFS_TRACE)         += support/ktrace.o
diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
deleted file mode 100644
index 97316451fc6d..000000000000
--- a/fs/xfs/Makefile-linux-2.6
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 2000-2005 Silicon Graphics, Inc.
-# All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-EXTRA_CFLAGS +=  -Ifs/xfs -Ifs/xfs/linux-2.6 -funsigned-char
-XFS_LINUX := linux-2.6
-ifeq ($(CONFIG_XFS_DEBUG),y)
-        EXTRA_CFLAGS += -g
-endif
-obj-$(CONFIG_XFS_FS)            += xfs.o
-xfs-$(CONFIG_XFS_QUOTA)         += $(addprefix quota/, \
-                                   xfs_dquot.o \
-                                   xfs_dquot_item.o \
-                                   xfs_trans_dquot.o \
-                                   xfs_qm_syscalls.o \
-                                   xfs_qm_bhv.o \
-                                   xfs_qm.o)
-ifeq ($(CONFIG_XFS_QUOTA),y)
-xfs-$(CONFIG_PROC_FS)           += quota/xfs_qm_stats.o
-endif
-xfs-$(CONFIG_XFS_RT)            += xfs_rtalloc.o
-xfs-$(CONFIG_XFS_POSIX_ACL)     += xfs_acl.o
-xfs-$(CONFIG_PROC_FS)           += $(XFS_LINUX)/xfs_stats.o
-xfs-$(CONFIG_SYSCTL)            += $(XFS_LINUX)/xfs_sysctl.o
-xfs-$(CONFIG_COMPAT)            += $(XFS_LINUX)/xfs_ioctl32.o
-xfs-y                           += xfs_alloc.o \
-                                   xfs_alloc_btree.o \
-                                   xfs_attr.o \
-                                   xfs_attr_leaf.o \
-                                   xfs_bit.o \
-                                   xfs_bmap.o \
-                                   xfs_bmap_btree.o \
-                                   xfs_btree.o \
-                                   xfs_buf_item.o \
-                                   xfs_da_btree.o \
-                                   xfs_dir2.o \
-                                   xfs_dir2_block.o \
-                                   xfs_dir2_data.o \
-                                   xfs_dir2_leaf.o \
-                                   xfs_dir2_node.o \
-                                   xfs_dir2_sf.o \
-                                   xfs_error.o \
-                                   xfs_extfree_item.o \
-                                   xfs_filestream.o \
-                                   xfs_fsops.o \
-                                   xfs_ialloc.o \
-                                   xfs_ialloc_btree.o \
-                                   xfs_iget.o \
-                                   xfs_inode.o \
-                                   xfs_inode_item.o \
-                                   xfs_iomap.o \
-                                   xfs_itable.o \
-                                   xfs_dfrag.o \
-                                   xfs_log.o \
-                                   xfs_log_recover.o \
-                                   xfs_mount.o \
-                                   xfs_mru_cache.o \
-                                   xfs_rename.o \
-                                   xfs_trans.o \
-                                   xfs_trans_ail.o \
-                                   xfs_trans_buf.o \
-                                   xfs_trans_extfree.o \
-                                   xfs_trans_inode.o \
-                                   xfs_trans_item.o \
-                                   xfs_utils.o \
-                                   xfs_vfsops.o \
-                                   xfs_vnodeops.o \
-                                   xfs_rw.o \
-                                   xfs_dmops.o \
-                                   xfs_qmops.o
-xfs-$(CONFIG_XFS_TRACE)         += xfs_dir2_trace.o
-# Objects in linux/
-xfs-y                           += $(addprefix $(XFS_LINUX)/, \
-                                   kmem.o \
-                                   xfs_aops.o \
-                                   xfs_buf.o \
-                                   xfs_export.o \
-                                   xfs_file.o \
-                                   xfs_fs_subr.o \
-                                   xfs_globals.o \
-                                   xfs_ioctl.o \
-                                   xfs_iops.o \
-                                   xfs_lrw.o \
-                                   xfs_super.o \
-                                   xfs_vnode.o)
-# Objects in support/
-xfs-y                           += $(addprefix support/, \
-                                   debug.o \
-                                   uuid.o)
-xfs-$(CONFIG_XFS_TRACE)         += support/ktrace.o
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 21dfc9da235e..8831d9518790 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -171,7 +171,7 @@ xfs_parseargs(
        char                    *this_char, *value, *eov;
        int                     dsunit, dswidth, vol_dsunit, vol_dswidth;
        int                     iosize;
-        int                     ikeep = 0;
+        int                     dmapi_implies_ikeep = 1;
        args->flags |= XFSMNT_BARRIER;
        args->flags2 |= XFSMNT2_COMPAT_IOSIZE;
@@ -302,10 +302,10 @@ xfs_parseargs(
                } else if (!strcmp(this_char, MNTOPT_NOBARRIER)) {
                        args->flags &= ~XFSMNT_BARRIER;
                } else if (!strcmp(this_char, MNTOPT_IKEEP)) {
-                        ikeep = 1;
+                        args->flags |= XFSMNT_IKEEP;
-                        args->flags &= ~XFSMNT_IDELETE;
                } else if (!strcmp(this_char, MNTOPT_NOIKEEP)) {
-                        args->flags |= XFSMNT_IDELETE;
+                        dmapi_implies_ikeep = 0;
+                        args->flags &= ~XFSMNT_IKEEP;
                } else if (!strcmp(this_char, MNTOPT_LARGEIO)) {
                        args->flags2 &= ~XFSMNT2_COMPAT_IOSIZE;
                } else if (!strcmp(this_char, MNTOPT_NOLARGEIO)) {
@@ -410,8 +410,8 @@ xfs_parseargs(
         * Note that if "ikeep" or "noikeep" mount options are
         * supplied, then they are honored.
         */
-        if (!(args->flags & XFSMNT_DMAPI) && !ikeep)
+        if ((args->flags & XFSMNT_DMAPI) && dmapi_implies_ikeep)
-                args->flags |= XFSMNT_IDELETE;
+                args->flags |= XFSMNT_IKEEP;
        if ((args->flags & XFSMNT_NOALIGN) != XFSMNT_NOALIGN) {
                if (dsunit) {
@@ -446,6 +446,7 @@ xfs_showargs(
 {
        static struct proc_xfs_info xfs_info_set[] = {
                /* the few simple ones we can get from the mount struct */
+                { XFS_MOUNT_IKEEP,              "," MNTOPT_IKEEP },
                { XFS_MOUNT_WSYNC,              "," MNTOPT_WSYNC },
                { XFS_MOUNT_INO64,              "," MNTOPT_INO64 },
                { XFS_MOUNT_NOALIGN,            "," MNTOPT_NOALIGN },
@@ -461,7 +462,6 @@ xfs_showargs(
        };
        static struct proc_xfs_info xfs_info_unset[] = {
                /* the few simple ones we can get from the mount struct */
-                { XFS_MOUNT_IDELETE,            "," MNTOPT_IKEEP },
                { XFS_MOUNT_COMPAT_IOSIZE,      "," MNTOPT_LARGEIO },
                { XFS_MOUNT_BARRIER,            "," MNTOPT_NOBARRIER },
                { XFS_MOUNT_SMALL_INUMS,        "," MNTOPT_64BITINODE },
diff --git a/fs/xfs/xfs_bit.c b/fs/xfs/xfs_bit.c
index 48228848f5ae..fab0b6d5a41b 100644
--- a/fs/xfs/xfs_bit.c
+++ b/fs/xfs/xfs_bit.c
@@ -25,6 +25,109 @@
 * XFS bit manipulation routines, used in non-realtime code.
 */
+#ifndef HAVE_ARCH_HIGHBIT
+/*
+ * Index of high bit number in byte, -1 for none set, 0..7 otherwise.
+ */
+static const char xfs_highbit[256] = {
+       -1, 0, 1, 1, 2, 2, 2, 2,                 /* 00 .. 07 */
+        3, 3, 3, 3, 3, 3, 3, 3,                 /* 08 .. 0f */
+        4, 4, 4, 4, 4, 4, 4, 4,                 /* 10 .. 17 */
+        4, 4, 4, 4, 4, 4, 4, 4,                 /* 18 .. 1f */
+        5, 5, 5, 5, 5, 5, 5, 5,                 /* 20 .. 27 */
+        5, 5, 5, 5, 5, 5, 5, 5,                 /* 28 .. 2f */
+        5, 5, 5, 5, 5, 5, 5, 5,                 /* 30 .. 37 */
+        5, 5, 5, 5, 5, 5, 5, 5,                 /* 38 .. 3f */
+        6, 6, 6, 6, 6, 6, 6, 6,                 /* 40 .. 47 */
+        6, 6, 6, 6, 6, 6, 6, 6,                 /* 48 .. 4f */
+        6, 6, 6, 6, 6, 6, 6, 6,                 /* 50 .. 57 */
+        6, 6, 6, 6, 6, 6, 6, 6,                 /* 58 .. 5f */
+        6, 6, 6, 6, 6, 6, 6, 6,                 /* 60 .. 67 */
+        6, 6, 6, 6, 6, 6, 6, 6,                 /* 68 .. 6f */
+        6, 6, 6, 6, 6, 6, 6, 6,                 /* 70 .. 77 */
+        6, 6, 6, 6, 6, 6, 6, 6,                 /* 78 .. 7f */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* 80 .. 87 */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* 88 .. 8f */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* 90 .. 97 */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* 98 .. 9f */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* a0 .. a7 */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* a8 .. af */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* b0 .. b7 */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* b8 .. bf */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* c0 .. c7 */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* c8 .. cf */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* d0 .. d7 */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* d8 .. df */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* e0 .. e7 */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* e8 .. ef */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* f0 .. f7 */
+        7, 7, 7, 7, 7, 7, 7, 7,                 /* f8 .. ff */
+};
+#endif
+/*
+ * xfs_highbit32: get high bit set out of 32-bit argument, -1 if none set.
+ */
+inline int
+xfs_highbit32(
+        __uint32_t      v)
+{
+#ifdef HAVE_ARCH_HIGHBIT
+        return highbit32(v);
+#else
+        int             i;
+        if (v & 0xffff0000)
+                if (v & 0xff000000)
+                        i = 24;
+                else
+                        i = 16;
+        else if (v & 0x0000ffff)
+                if (v & 0x0000ff00)
+                        i = 8;
+                else
+                        i = 0;
+        else
+                return -1;
+        return i + xfs_highbit[(v >> i) & 0xff];
+#endif
+}
+/*
+ * xfs_lowbit64: get low bit set out of 64-bit argument, -1 if none set.
+ */
+int
+xfs_lowbit64(
+        __uint64_t      v)
+{
+        __uint32_t      w = (__uint32_t)v;
+        int             n = 0;
+        if (w) {        /* lower bits */
+                n = ffs(w);
+        } else {        /* upper bits */
+                w = (__uint32_t)(v >> 32);
+                if (w && (n = ffs(w)))
+                        n += 32;
+        }
+        return n - 1;
+}
+/*
+ * xfs_highbit64: get high bit set out of 64-bit argument, -1 if none set.
+ */
+int
+xfs_highbit64(
+        __uint64_t      v)
+{
+        __uint32_t      h = (__uint32_t)(v >> 32);
+        if (h)
+                return xfs_highbit32(h) + 32;
+        return xfs_highbit32((__uint32_t)v);
+}
 /*
 * Return whether bitmap is empty.
 * Size is number of words in the bitmap, which is padded to word boundary
diff --git a/fs/xfs/xfs_bit.h b/fs/xfs/xfs_bit.h
index 325a007dec91..082641a9782c 100644
--- a/fs/xfs/xfs_bit.h
+++ b/fs/xfs/xfs_bit.h
@@ -47,30 +47,13 @@ static inline __uint64_t xfs_mask64lo(int n)
 }
 /* Get high bit set out of 32-bit argument, -1 if none set */
-static inline int xfs_highbit32(__uint32_t v)
+extern int xfs_highbit32(__uint32_t v);
-{
-        return fls(v) - 1;
-}
-/* Get high bit set out of 64-bit argument, -1 if none set */
-static inline int xfs_highbit64(__uint64_t v)
-{
-        return fls64(v) - 1;
-}
-/* Get low bit set out of 32-bit argument, -1 if none set */
-static inline int xfs_lowbit32(__uint32_t v)
-{
-        __uint32_t t = v;
-        return (t) ? find_first_bit((unsigned long *)&t, 32) : -1;
-}
 /* Get low bit set out of 64-bit argument, -1 if none set */
-static inline int xfs_lowbit64(__uint64_t v)
+extern int xfs_lowbit64(__uint64_t v);
-{
-        __uint64_t t = v;
+/* Get high bit set out of 64-bit argument, -1 if none set */
-        return (t) ? find_first_bit((unsigned long *)&t, 64) : -1;
+extern int xfs_highbit64(__uint64_t);
-}
 /* Return whether bitmap is empty (1 == empty) */
 extern int xfs_bitmap_empty(uint *map, uint size);
diff --git a/fs/xfs/xfs_clnt.h b/fs/xfs/xfs_clnt.h
index d16c1b971074..d5d1e60ee224 100644
--- a/fs/xfs/xfs_clnt.h
+++ b/fs/xfs/xfs_clnt.h
@@ -86,7 +86,7 @@ struct xfs_mount_args {
 #define XFSMNT_NOUUID           0x01000000      /* Ignore fs uuid */
 #define XFSMNT_DMAPI            0x02000000      /* enable dmapi/xdsm */
 #define XFSMNT_BARRIER          0x04000000      /* use write barriers */
-#define XFSMNT_IDELETE          0x08000000      /* inode cluster delete */
+#define XFSMNT_IKEEP            0x08000000      /* inode cluster delete */
 #define XFSMNT_SWALLOC          0x10000000      /* turn on stripe width
                                                 * allocation */
 #define XFSMNT_DIRSYNC          0x40000000      /* sync creat,link,unlink,rename
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index c5836b951d0c..db9d5fa600af 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -1053,7 +1053,7 @@ xfs_difree(
        /*
         * When an inode cluster is free, it becomes eligible for removal
         */
-        if ((mp->m_flags & XFS_MOUNT_IDELETE) &&
+        if (!(mp->m_flags & XFS_MOUNT_IKEEP) &&
            (rec.ir_freecount == XFS_IALLOC_INODES(mp))) {
                *delete = 1;
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index f7c620ec6e69..1d8a4728d847 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -366,7 +366,7 @@ typedef struct xfs_mount {
 #define XFS_MOUNT_SMALL_INUMS   (1ULL << 15)    /* users wants 32bit inodes */
 #define XFS_MOUNT_NOUUID        (1ULL << 16)    /* ignore uuid during mount */
 #define XFS_MOUNT_BARRIER       (1ULL << 17)
-#define XFS_MOUNT_IDELETE       (1ULL << 18)    /* delete empty inode clusters*/
+#define XFS_MOUNT_IKEEP         (1ULL << 18)    /* keep empty inode clusters*/
 #define XFS_MOUNT_SWALLOC       (1ULL << 19)    /* turn on stripe width
                                                 * allocation */
 #define XFS_MOUNT_RDONLY        (1ULL << 20)    /* read-only fs */
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index ca83ddf72af4..47082c01872d 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -73,6 +73,18 @@ STATIC int xfs_rtmodify_summary(xfs_mount_t *, xfs_trans_t *, int,
 */
 /*
+ * xfs_lowbit32: get low bit set out of 32-bit argument, -1 if none set.
+ */
+STATIC int
+xfs_lowbit32(
+        __uint32_t      v)
+{
+        if (v)
+                return ffs(v) - 1;
+        return -1;
+}
+/*
 * Allocate space to the bitmap or summary file, and zero it, for growfs.
 */
 STATIC int                              /* error */
@@ -432,7 +444,6 @@ xfs_rtallocate_extent_near(
        }
        bbno = XFS_BITTOBLOCK(mp, bno);
        i = 0;
-        ASSERT(minlen != 0);
        log2len = xfs_highbit32(minlen);
        /*
         * Loop over all bitmap blocks (bbno + i is current block).
@@ -601,8 +612,6 @@ xfs_rtallocate_extent_size(
        xfs_suminfo_t   sum;            /* summary information for extents */
        ASSERT(minlen % prod == 0 && maxlen % prod == 0);
-        ASSERT(maxlen != 0);
        /*
         * Loop over all the levels starting with maxlen.
         * At each level, look at all the bitmap blocks, to see if there
@@ -660,9 +669,6 @@ xfs_rtallocate_extent_size(
                *rtblock = NULLRTBLOCK;
                return 0;
        }
-        ASSERT(minlen != 0);
-        ASSERT(maxlen != 0);
        /*
         * Loop over sizes, from maxlen down to minlen.
         * This time, when we do the allocations, allow smaller ones
@@ -1948,7 +1954,6 @@ xfs_growfs_rt(
                                  nsbp->sb_blocksize * nsbp->sb_rextsize);
                nsbp->sb_rextents = nsbp->sb_rblocks;
                do_div(nsbp->sb_rextents, nsbp->sb_rextsize);
-                ASSERT(nsbp->sb_rextents != 0);
                nsbp->sb_rextslog = xfs_highbit32(nsbp->sb_rextents);
                nrsumlevels = nmp->m_rsumlevels = nsbp->sb_rextslog + 1;
                nrsumsize =
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 413587f02155..7321304a69cc 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -281,8 +281,8 @@ xfs_start_flags(
                mp->m_readio_log = mp->m_writeio_log = ap->iosizelog;
        }
-        if (ap->flags & XFSMNT_IDELETE)
+        if (ap->flags & XFSMNT_IKEEP)
-                mp->m_flags |= XFS_MOUNT_IDELETE;
+                mp->m_flags |= XFS_MOUNT_IKEEP;
        if (ap->flags & XFSMNT_DIRSYNC)
                mp->m_flags |= XFS_MOUNT_DIRSYNC;
        if (ap->flags & XFSMNT_ATTR2)

diff --git a/fs/xfs/Kbuild b/fs/xfs/Kbuild deleted file mode 100644 index 2566e96706f1..000000000000 --- a/fs/xfs/Kbuild +++ /dev/null
@@ -1,6 +0,0 @@
1	#
2	# The xfs people like to share Makefile with 2.6 and 2.4.
3	# Utilise file named Kbuild file which has precedence over Makefile.
4	#
5
6	include $(srctree)/$(obj)/Makefile-linux-2.6


diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index 49e3e7e5e3dc..36ec614e699a 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile
@@ -1 +1,117 @@
1	include $(TOPDIR)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL)	1	#
		2	# Copyright (c) 2000-2005 Silicon Graphics, Inc.
		3	# All Rights Reserved.
		4	#
		5	# This program is free software; you can redistribute it and/or
		6	# modify it under the terms of the GNU General Public License as
		7	# published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it would be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write the Free Software Foundation,
		16	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
		17	#
		18
		19	EXTRA_CFLAGS += -I$(src) -I$(src)/linux-2.6 -funsigned-char
		20
		21	XFS_LINUX := linux-2.6
		22
		23	ifeq ($(CONFIG_XFS_DEBUG),y)
		24	EXTRA_CFLAGS += -g
		25	endif
		26
		27	obj-$(CONFIG_XFS_FS) += xfs.o
		28
		29	xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \
		30	xfs_dquot.o \
		31	xfs_dquot_item.o \
		32	xfs_trans_dquot.o \
		33	xfs_qm_syscalls.o \
		34	xfs_qm_bhv.o \
		35	xfs_qm.o)
		36
		37	ifeq ($(CONFIG_XFS_QUOTA),y)
		38	xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o
		39	endif
		40
		41	xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
		42	xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
		43	xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o
		44	xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o
		45	xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o
		46
		47
		48	xfs-y += xfs_alloc.o \
		49	xfs_alloc_btree.o \
		50	xfs_attr.o \
		51	xfs_attr_leaf.o \
		52	xfs_bit.o \
		53	xfs_bmap.o \
		54	xfs_bmap_btree.o \
		55	xfs_btree.o \
		56	xfs_buf_item.o \
		57	xfs_da_btree.o \
		58	xfs_dir2.o \
		59	xfs_dir2_block.o \
		60	xfs_dir2_data.o \
		61	xfs_dir2_leaf.o \
		62	xfs_dir2_node.o \
		63	xfs_dir2_sf.o \
		64	xfs_error.o \
		65	xfs_extfree_item.o \
		66	xfs_filestream.o \
		67	xfs_fsops.o \
		68	xfs_ialloc.o \
		69	xfs_ialloc_btree.o \
		70	xfs_iget.o \
		71	xfs_inode.o \
		72	xfs_inode_item.o \
		73	xfs_iomap.o \
		74	xfs_itable.o \
		75	xfs_dfrag.o \
		76	xfs_log.o \
		77	xfs_log_recover.o \
		78	xfs_mount.o \
		79	xfs_mru_cache.o \
		80	xfs_rename.o \
		81	xfs_trans.o \
		82	xfs_trans_ail.o \
		83	xfs_trans_buf.o \
		84	xfs_trans_extfree.o \
		85	xfs_trans_inode.o \
		86	xfs_trans_item.o \
		87	xfs_utils.o \
		88	xfs_vfsops.o \
		89	xfs_vnodeops.o \
		90	xfs_rw.o \
		91	xfs_dmops.o \
		92	xfs_qmops.o
		93
		94	xfs-$(CONFIG_XFS_TRACE) += xfs_dir2_trace.o
		95
		96	# Objects in linux/
		97	xfs-y += $(addprefix $(XFS_LINUX)/, \
		98	kmem.o \
		99	xfs_aops.o \
		100	xfs_buf.o \
		101	xfs_export.o \
		102	xfs_file.o \
		103	xfs_fs_subr.o \
		104	xfs_globals.o \
		105	xfs_ioctl.o \
		106	xfs_iops.o \
		107	xfs_lrw.o \
		108	xfs_super.o \
		109	xfs_vnode.o)
		110
		111	# Objects in support/
		112	xfs-y += $(addprefix support/, \
		113	debug.o \
		114	uuid.o)
		115
		116	xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o
		117


diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6 deleted file mode 100644 index 97316451fc6d..000000000000 --- a/fs/xfs/Makefile-linux-2.6 +++ /dev/null
@@ -1,117 +0,0 @@
1	#
2	# Copyright (c) 2000-2005 Silicon Graphics, Inc.
3	# All Rights Reserved.
4	#
5	# This program is free software; you can redistribute it and/or
6	# modify it under the terms of the GNU General Public License as
7	# published by the Free Software Foundation.
8	#
9	# This program is distributed in the hope that it would be useful,
10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	# GNU General Public License for more details.
13	#
14	# You should have received a copy of the GNU General Public License
15	# along with this program; if not, write the Free Software Foundation,
16	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17	#
18
19	EXTRA_CFLAGS += -Ifs/xfs -Ifs/xfs/linux-2.6 -funsigned-char
20
21	XFS_LINUX := linux-2.6
22
23	ifeq ($(CONFIG_XFS_DEBUG),y)
24	EXTRA_CFLAGS += -g
25	endif
26
27	obj-$(CONFIG_XFS_FS) += xfs.o
28
29	xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \
30	xfs_dquot.o \
31	xfs_dquot_item.o \
32	xfs_trans_dquot.o \
33	xfs_qm_syscalls.o \
34	xfs_qm_bhv.o \
35	xfs_qm.o)
36
37	ifeq ($(CONFIG_XFS_QUOTA),y)
38	xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o
39	endif
40
41	xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
42	xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
43	xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o
44	xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o
45	xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o
46
47
48	xfs-y += xfs_alloc.o \
49	xfs_alloc_btree.o \
50	xfs_attr.o \
51	xfs_attr_leaf.o \
52	xfs_bit.o \
53	xfs_bmap.o \
54	xfs_bmap_btree.o \
55	xfs_btree.o \
56	xfs_buf_item.o \
57	xfs_da_btree.o \
58	xfs_dir2.o \
59	xfs_dir2_block.o \
60	xfs_dir2_data.o \
61	xfs_dir2_leaf.o \
62	xfs_dir2_node.o \
63	xfs_dir2_sf.o \
64	xfs_error.o \
65	xfs_extfree_item.o \
66	xfs_filestream.o \
67	xfs_fsops.o \
68	xfs_ialloc.o \
69	xfs_ialloc_btree.o \
70	xfs_iget.o \
71	xfs_inode.o \
72	xfs_inode_item.o \
73	xfs_iomap.o \
74	xfs_itable.o \
75	xfs_dfrag.o \
76	xfs_log.o \
77	xfs_log_recover.o \
78	xfs_mount.o \
79	xfs_mru_cache.o \
80	xfs_rename.o \
81	xfs_trans.o \
82	xfs_trans_ail.o \
83	xfs_trans_buf.o \
84	xfs_trans_extfree.o \
85	xfs_trans_inode.o \
86	xfs_trans_item.o \
87	xfs_utils.o \
88	xfs_vfsops.o \
89	xfs_vnodeops.o \
90	xfs_rw.o \
91	xfs_dmops.o \
92	xfs_qmops.o
93
94	xfs-$(CONFIG_XFS_TRACE) += xfs_dir2_trace.o
95
96	# Objects in linux/
97	xfs-y += $(addprefix $(XFS_LINUX)/, \
98	kmem.o \
99	xfs_aops.o \
100	xfs_buf.o \
101	xfs_export.o \
102	xfs_file.o \
103	xfs_fs_subr.o \
104	xfs_globals.o \
105	xfs_ioctl.o \
106	xfs_iops.o \
107	xfs_lrw.o \
108	xfs_super.o \
109	xfs_vnode.o)
110
111	# Objects in support/
112	xfs-y += $(addprefix support/, \
113	debug.o \
114	uuid.o)
115
116	xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o
117


diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 21dfc9da235e..8831d9518790 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -171,7 +171,7 @@ xfs_parseargs(
171	char this_char, value, *eov;	171	char this_char, value, *eov;
172	int dsunit, dswidth, vol_dsunit, vol_dswidth;	172	int dsunit, dswidth, vol_dsunit, vol_dswidth;
173	int iosize;	173	int iosize;
174	int ikeep = 0;	174	int dmapi_implies_ikeep = 1;
175		175
176	args->flags \|= XFSMNT_BARRIER;	176	args->flags \|= XFSMNT_BARRIER;
177	args->flags2 \|= XFSMNT2_COMPAT_IOSIZE;	177	args->flags2 \|= XFSMNT2_COMPAT_IOSIZE;
@@ -302,10 +302,10 @@ xfs_parseargs(
302	} else if (!strcmp(this_char, MNTOPT_NOBARRIER)) {	302	} else if (!strcmp(this_char, MNTOPT_NOBARRIER)) {
303	args->flags &= ~XFSMNT_BARRIER;	303	args->flags &= ~XFSMNT_BARRIER;
304	} else if (!strcmp(this_char, MNTOPT_IKEEP)) {	304	} else if (!strcmp(this_char, MNTOPT_IKEEP)) {
305	ikeep = 1;	305	args->flags \|= XFSMNT_IKEEP;
306	args->flags &= ~XFSMNT_IDELETE;
307	} else if (!strcmp(this_char, MNTOPT_NOIKEEP)) {	306	} else if (!strcmp(this_char, MNTOPT_NOIKEEP)) {
308	args->flags \|= XFSMNT_IDELETE;	307	dmapi_implies_ikeep = 0;
		308	args->flags &= ~XFSMNT_IKEEP;
309	} else if (!strcmp(this_char, MNTOPT_LARGEIO)) {	309	} else if (!strcmp(this_char, MNTOPT_LARGEIO)) {
310	args->flags2 &= ~XFSMNT2_COMPAT_IOSIZE;	310	args->flags2 &= ~XFSMNT2_COMPAT_IOSIZE;
311	} else if (!strcmp(this_char, MNTOPT_NOLARGEIO)) {	311	} else if (!strcmp(this_char, MNTOPT_NOLARGEIO)) {
@@ -410,8 +410,8 @@ xfs_parseargs(
410	* Note that if "ikeep" or "noikeep" mount options are	410	* Note that if "ikeep" or "noikeep" mount options are
411	* supplied, then they are honored.	411	* supplied, then they are honored.
412	*/	412	*/
413	if (!(args->flags & XFSMNT_DMAPI) && !ikeep)	413	if ((args->flags & XFSMNT_DMAPI) && dmapi_implies_ikeep)
414	args->flags \|= XFSMNT_IDELETE;	414	args->flags \|= XFSMNT_IKEEP;
415		415
416	if ((args->flags & XFSMNT_NOALIGN) != XFSMNT_NOALIGN) {	416	if ((args->flags & XFSMNT_NOALIGN) != XFSMNT_NOALIGN) {
417	if (dsunit) {	417	if (dsunit) {
@@ -446,6 +446,7 @@ xfs_showargs(
446	{	446	{
447	static struct proc_xfs_info xfs_info_set[] = {	447	static struct proc_xfs_info xfs_info_set[] = {
448	/* the few simple ones we can get from the mount struct */	448	/* the few simple ones we can get from the mount struct */
		449	{ XFS_MOUNT_IKEEP, "," MNTOPT_IKEEP },
449	{ XFS_MOUNT_WSYNC, "," MNTOPT_WSYNC },	450	{ XFS_MOUNT_WSYNC, "," MNTOPT_WSYNC },
450	{ XFS_MOUNT_INO64, "," MNTOPT_INO64 },	451	{ XFS_MOUNT_INO64, "," MNTOPT_INO64 },
451	{ XFS_MOUNT_NOALIGN, "," MNTOPT_NOALIGN },	452	{ XFS_MOUNT_NOALIGN, "," MNTOPT_NOALIGN },
@@ -461,7 +462,6 @@ xfs_showargs(
461	};	462	};
462	static struct proc_xfs_info xfs_info_unset[] = {	463	static struct proc_xfs_info xfs_info_unset[] = {
463	/* the few simple ones we can get from the mount struct */	464	/* the few simple ones we can get from the mount struct */
464	{ XFS_MOUNT_IDELETE, "," MNTOPT_IKEEP },
465	{ XFS_MOUNT_COMPAT_IOSIZE, "," MNTOPT_LARGEIO },	465	{ XFS_MOUNT_COMPAT_IOSIZE, "," MNTOPT_LARGEIO },
466	{ XFS_MOUNT_BARRIER, "," MNTOPT_NOBARRIER },	466	{ XFS_MOUNT_BARRIER, "," MNTOPT_NOBARRIER },
467	{ XFS_MOUNT_SMALL_INUMS, "," MNTOPT_64BITINODE },	467	{ XFS_MOUNT_SMALL_INUMS, "," MNTOPT_64BITINODE },


diff --git a/fs/xfs/xfs_bit.c b/fs/xfs/xfs_bit.c index 48228848f5ae..fab0b6d5a41b 100644 --- a/fs/xfs/xfs_bit.c +++ b/fs/xfs/xfs_bit.c
@@ -25,6 +25,109 @@
25	* XFS bit manipulation routines, used in non-realtime code.	25	* XFS bit manipulation routines, used in non-realtime code.
26	*/	26	*/
27		27
		28	#ifndef HAVE_ARCH_HIGHBIT
		29	/*
		30	* Index of high bit number in byte, -1 for none set, 0..7 otherwise.
		31	*/
		32	static const char xfs_highbit[256] = {
		33	-1, 0, 1, 1, 2, 2, 2, 2, /* 00 .. 07 */
		34	3, 3, 3, 3, 3, 3, 3, 3, /* 08 .. 0f */
		35	4, 4, 4, 4, 4, 4, 4, 4, /* 10 .. 17 */
		36	4, 4, 4, 4, 4, 4, 4, 4, /* 18 .. 1f */
		37	5, 5, 5, 5, 5, 5, 5, 5, /* 20 .. 27 */
		38	5, 5, 5, 5, 5, 5, 5, 5, /* 28 .. 2f */
		39	5, 5, 5, 5, 5, 5, 5, 5, /* 30 .. 37 */
		40	5, 5, 5, 5, 5, 5, 5, 5, /* 38 .. 3f */
		41	6, 6, 6, 6, 6, 6, 6, 6, /* 40 .. 47 */
		42	6, 6, 6, 6, 6, 6, 6, 6, /* 48 .. 4f */
		43	6, 6, 6, 6, 6, 6, 6, 6, /* 50 .. 57 */
		44	6, 6, 6, 6, 6, 6, 6, 6, /* 58 .. 5f */
		45	6, 6, 6, 6, 6, 6, 6, 6, /* 60 .. 67 */
		46	6, 6, 6, 6, 6, 6, 6, 6, /* 68 .. 6f */
		47	6, 6, 6, 6, 6, 6, 6, 6, /* 70 .. 77 */
		48	6, 6, 6, 6, 6, 6, 6, 6, /* 78 .. 7f */
		49	7, 7, 7, 7, 7, 7, 7, 7, /* 80 .. 87 */
		50	7, 7, 7, 7, 7, 7, 7, 7, /* 88 .. 8f */
		51	7, 7, 7, 7, 7, 7, 7, 7, /* 90 .. 97 */
		52	7, 7, 7, 7, 7, 7, 7, 7, /* 98 .. 9f */
		53	7, 7, 7, 7, 7, 7, 7, 7, /* a0 .. a7 */
		54	7, 7, 7, 7, 7, 7, 7, 7, /* a8 .. af */
		55	7, 7, 7, 7, 7, 7, 7, 7, /* b0 .. b7 */
		56	7, 7, 7, 7, 7, 7, 7, 7, /* b8 .. bf */
		57	7, 7, 7, 7, 7, 7, 7, 7, /* c0 .. c7 */
		58	7, 7, 7, 7, 7, 7, 7, 7, /* c8 .. cf */
		59	7, 7, 7, 7, 7, 7, 7, 7, /* d0 .. d7 */
		60	7, 7, 7, 7, 7, 7, 7, 7, /* d8 .. df */
		61	7, 7, 7, 7, 7, 7, 7, 7, /* e0 .. e7 */
		62	7, 7, 7, 7, 7, 7, 7, 7, /* e8 .. ef */
		63	7, 7, 7, 7, 7, 7, 7, 7, /* f0 .. f7 */
		64	7, 7, 7, 7, 7, 7, 7, 7, /* f8 .. ff */
		65	};
		66	#endif
		67
		68	/*
		69	* xfs_highbit32: get high bit set out of 32-bit argument, -1 if none set.
		70	*/
		71	inline int
		72	xfs_highbit32(
		73	__uint32_t v)
		74	{
		75	#ifdef HAVE_ARCH_HIGHBIT
		76	return highbit32(v);
		77	#else
		78	int i;
		79
		80	if (v & 0xffff0000)
		81	if (v & 0xff000000)
		82	i = 24;
		83	else
		84	i = 16;
		85	else if (v & 0x0000ffff)
		86	if (v & 0x0000ff00)
		87	i = 8;
		88	else
		89	i = 0;
		90	else
		91	return -1;
		92	return i + xfs_highbit[(v >> i) & 0xff];
		93	#endif
		94	}
		95
		96	/*
		97	* xfs_lowbit64: get low bit set out of 64-bit argument, -1 if none set.
		98	*/
		99	int
		100	xfs_lowbit64(
		101	__uint64_t v)
		102	{
		103	__uint32_t w = (__uint32_t)v;
		104	int n = 0;
		105
		106	if (w) { /* lower bits */
		107	n = ffs(w);
		108	} else { /* upper bits */
		109	w = (__uint32_t)(v >> 32);
		110	if (w && (n = ffs(w)))
		111	n += 32;
		112	}
		113	return n - 1;
		114	}
		115
		116	/*
		117	* xfs_highbit64: get high bit set out of 64-bit argument, -1 if none set.
		118	*/
		119	int
		120	xfs_highbit64(
		121	__uint64_t v)
		122	{
		123	__uint32_t h = (__uint32_t)(v >> 32);
		124
		125	if (h)
		126	return xfs_highbit32(h) + 32;
		127	return xfs_highbit32((__uint32_t)v);
		128	}
		129
		130
28	/*	131	/*
29	* Return whether bitmap is empty.	132	* Return whether bitmap is empty.
30	* Size is number of words in the bitmap, which is padded to word boundary	133	* Size is number of words in the bitmap, which is padded to word boundary


diff --git a/fs/xfs/xfs_bit.h b/fs/xfs/xfs_bit.h index 325a007dec91..082641a9782c 100644 --- a/fs/xfs/xfs_bit.h +++ b/fs/xfs/xfs_bit.h
@@ -47,30 +47,13 @@ static inline __uint64_t xfs_mask64lo(int n)
47	}	47	}
48		48
49	/* Get high bit set out of 32-bit argument, -1 if none set */	49	/* Get high bit set out of 32-bit argument, -1 if none set */
50	static inline int xfs_highbit32(__uint32_t v)	50	extern int xfs_highbit32(__uint32_t v);
51	{
52	return fls(v) - 1;
53	}
54
55	/* Get high bit set out of 64-bit argument, -1 if none set */
56	static inline int xfs_highbit64(__uint64_t v)
57	{
58	return fls64(v) - 1;
59	}
60
61	/* Get low bit set out of 32-bit argument, -1 if none set */
62	static inline int xfs_lowbit32(__uint32_t v)
63	{
64	__uint32_t t = v;
65	return (t) ? find_first_bit((unsigned long *)&t, 32) : -1;
66	}
67		51
68	/* Get low bit set out of 64-bit argument, -1 if none set */	52	/* Get low bit set out of 64-bit argument, -1 if none set */
69	static inline int xfs_lowbit64(__uint64_t v)	53	extern int xfs_lowbit64(__uint64_t v);
70	{	54
71	__uint64_t t = v;	55	/* Get high bit set out of 64-bit argument, -1 if none set */
72	return (t) ? find_first_bit((unsigned long *)&t, 64) : -1;	56	extern int xfs_highbit64(__uint64_t);
73	}
74		57
75	/* Return whether bitmap is empty (1 == empty) */	58	/* Return whether bitmap is empty (1 == empty) */
76	extern int xfs_bitmap_empty(uint *map, uint size);	59	extern int xfs_bitmap_empty(uint *map, uint size);


diff --git a/fs/xfs/xfs_clnt.h b/fs/xfs/xfs_clnt.h index d16c1b971074..d5d1e60ee224 100644 --- a/fs/xfs/xfs_clnt.h +++ b/fs/xfs/xfs_clnt.h
@@ -86,7 +86,7 @@ struct xfs_mount_args {
86	#define XFSMNT_NOUUID 0x01000000 /* Ignore fs uuid */	86	#define XFSMNT_NOUUID 0x01000000 /* Ignore fs uuid */
87	#define XFSMNT_DMAPI 0x02000000 /* enable dmapi/xdsm */	87	#define XFSMNT_DMAPI 0x02000000 /* enable dmapi/xdsm */
88	#define XFSMNT_BARRIER 0x04000000 /* use write barriers */	88	#define XFSMNT_BARRIER 0x04000000 /* use write barriers */
89	#define XFSMNT_IDELETE 0x08000000 /* inode cluster delete */	89	#define XFSMNT_IKEEP 0x08000000 /* inode cluster delete */
90	#define XFSMNT_SWALLOC 0x10000000 /* turn on stripe width	90	#define XFSMNT_SWALLOC 0x10000000 /* turn on stripe width
91	* allocation */	91	* allocation */
92	#define XFSMNT_DIRSYNC 0x40000000 /* sync creat,link,unlink,rename	92	#define XFSMNT_DIRSYNC 0x40000000 /* sync creat,link,unlink,rename


diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index c5836b951d0c..db9d5fa600af 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c
@@ -1053,7 +1053,7 @@ xfs_difree(
1053	/*	1053	/*
1054	* When an inode cluster is free, it becomes eligible for removal	1054	* When an inode cluster is free, it becomes eligible for removal
1055	*/	1055	*/
1056	if ((mp->m_flags & XFS_MOUNT_IDELETE) &&	1056	if (!(mp->m_flags & XFS_MOUNT_IKEEP) &&
1057	(rec.ir_freecount == XFS_IALLOC_INODES(mp))) {	1057	(rec.ir_freecount == XFS_IALLOC_INODES(mp))) {
1058		1058
1059	*delete = 1;	1059	*delete = 1;


diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index f7c620ec6e69..1d8a4728d847 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h
@@ -366,7 +366,7 @@ typedef struct xfs_mount {
366	#define XFS_MOUNT_SMALL_INUMS (1ULL << 15) /* users wants 32bit inodes */	366	#define XFS_MOUNT_SMALL_INUMS (1ULL << 15) /* users wants 32bit inodes */
367	#define XFS_MOUNT_NOUUID (1ULL << 16) /* ignore uuid during mount */	367	#define XFS_MOUNT_NOUUID (1ULL << 16) /* ignore uuid during mount */
368	#define XFS_MOUNT_BARRIER (1ULL << 17)	368	#define XFS_MOUNT_BARRIER (1ULL << 17)
369	#define XFS_MOUNT_IDELETE (1ULL << 18) /* delete empty inode clusters*/	369	#define XFS_MOUNT_IKEEP (1ULL << 18) /* keep empty inode clusters*/
370	#define XFS_MOUNT_SWALLOC (1ULL << 19) /* turn on stripe width	370	#define XFS_MOUNT_SWALLOC (1ULL << 19) /* turn on stripe width
371	* allocation */	371	* allocation */
372	#define XFS_MOUNT_RDONLY (1ULL << 20) /* read-only fs */	372	#define XFS_MOUNT_RDONLY (1ULL << 20) /* read-only fs */


diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index ca83ddf72af4..47082c01872d 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c
@@ -73,6 +73,18 @@ STATIC int xfs_rtmodify_summary(xfs_mount_t , xfs_trans_t , int,
73	*/	73	*/
74		74
75	/*	75	/*
		76	* xfs_lowbit32: get low bit set out of 32-bit argument, -1 if none set.
		77	*/
		78	STATIC int
		79	xfs_lowbit32(
		80	__uint32_t v)
		81	{
		82	if (v)
		83	return ffs(v) - 1;
		84	return -1;
		85	}
		86
		87	/*
76	* Allocate space to the bitmap or summary file, and zero it, for growfs.	88	* Allocate space to the bitmap or summary file, and zero it, for growfs.
77	*/	89	*/
78	STATIC int /* error */	90	STATIC int /* error */
@@ -432,7 +444,6 @@ xfs_rtallocate_extent_near(
432	}	444	}
433	bbno = XFS_BITTOBLOCK(mp, bno);	445	bbno = XFS_BITTOBLOCK(mp, bno);
434	i = 0;	446	i = 0;
435	ASSERT(minlen != 0);
436	log2len = xfs_highbit32(minlen);	447	log2len = xfs_highbit32(minlen);
437	/*	448	/*
438	* Loop over all bitmap blocks (bbno + i is current block).	449	* Loop over all bitmap blocks (bbno + i is current block).
@@ -601,8 +612,6 @@ xfs_rtallocate_extent_size(
601	xfs_suminfo_t sum; /* summary information for extents */	612	xfs_suminfo_t sum; /* summary information for extents */
602		613
603	ASSERT(minlen % prod == 0 && maxlen % prod == 0);	614	ASSERT(minlen % prod == 0 && maxlen % prod == 0);
604	ASSERT(maxlen != 0);
605
606	/*	615	/*
607	* Loop over all the levels starting with maxlen.	616	* Loop over all the levels starting with maxlen.
608	* At each level, look at all the bitmap blocks, to see if there	617	* At each level, look at all the bitmap blocks, to see if there
@@ -660,9 +669,6 @@ xfs_rtallocate_extent_size(
660	*rtblock = NULLRTBLOCK;	669	*rtblock = NULLRTBLOCK;
661	return 0;	670	return 0;
662	}	671	}
663	ASSERT(minlen != 0);
664	ASSERT(maxlen != 0);
665
666	/*	672	/*
667	* Loop over sizes, from maxlen down to minlen.	673	* Loop over sizes, from maxlen down to minlen.
668	* This time, when we do the allocations, allow smaller ones	674	* This time, when we do the allocations, allow smaller ones
@@ -1948,7 +1954,6 @@ xfs_growfs_rt(
1948	nsbp->sb_blocksize * nsbp->sb_rextsize);	1954	nsbp->sb_blocksize * nsbp->sb_rextsize);
1949	nsbp->sb_rextents = nsbp->sb_rblocks;	1955	nsbp->sb_rextents = nsbp->sb_rblocks;
1950	do_div(nsbp->sb_rextents, nsbp->sb_rextsize);	1956	do_div(nsbp->sb_rextents, nsbp->sb_rextsize);
1951	ASSERT(nsbp->sb_rextents != 0);
1952	nsbp->sb_rextslog = xfs_highbit32(nsbp->sb_rextents);	1957	nsbp->sb_rextslog = xfs_highbit32(nsbp->sb_rextents);
1953	nrsumlevels = nmp->m_rsumlevels = nsbp->sb_rextslog + 1;	1958	nrsumlevels = nmp->m_rsumlevels = nsbp->sb_rextslog + 1;
1954	nrsumsize =	1959	nrsumsize =


diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c index 413587f02155..7321304a69cc 100644 --- a/fs/xfs/xfs_vfsops.c +++ b/fs/xfs/xfs_vfsops.c
@@ -281,8 +281,8 @@ xfs_start_flags(
281	mp->m_readio_log = mp->m_writeio_log = ap->iosizelog;	281	mp->m_readio_log = mp->m_writeio_log = ap->iosizelog;
282	}	282	}
283		283
284	if (ap->flags & XFSMNT_IDELETE)	284	if (ap->flags & XFSMNT_IKEEP)
285	mp->m_flags \|= XFS_MOUNT_IDELETE;	285	mp->m_flags \|= XFS_MOUNT_IKEEP;
286	if (ap->flags & XFSMNT_DIRSYNC)	286	if (ap->flags & XFSMNT_DIRSYNC)
287	mp->m_flags \|= XFS_MOUNT_DIRSYNC;	287	mp->m_flags \|= XFS_MOUNT_DIRSYNC;
288	if (ap->flags & XFSMNT_ATTR2)	288	if (ap->flags & XFSMNT_ATTR2)