Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

1 files changed, 33 insertions, 37 deletions

diff --git a/fs/xfs/xfs_dir.c b/fs/xfs/xfs_dir.c
index ba30bc7682f2..3dd30391f551 100644
--- a/fs/xfs/xfs_dir.c
+++ b/fs/xfs/xfs_dir.c
@@ -1,59 +1,43 @@
 /*
- * Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * 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.
+ * 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.
  *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ * 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
  */
-
 #include "xfs.h"
-
-#include "xfs_macros.h"
+#include "xfs_fs.h"
 #include "xfs_types.h"
-#include "xfs_inum.h"
 #include "xfs_log.h"
+#include "xfs_inum.h"
 #include "xfs_trans.h"
 #include "xfs_sb.h"
 #include "xfs_dir.h"
 #include "xfs_dir2.h"
 #include "xfs_dmapi.h"
 #include "xfs_mount.h"
-#include "xfs_alloc_btree.h"
+#include "xfs_da_btree.h"
 #include "xfs_bmap_btree.h"
+#include "xfs_alloc_btree.h"
 #include "xfs_ialloc_btree.h"
 #include "xfs_alloc.h"
 #include "xfs_btree.h"
-#include "xfs_attr_sf.h"
 #include "xfs_dir_sf.h"
 #include "xfs_dir2_sf.h"
+#include "xfs_attr_sf.h"
 #include "xfs_dinode.h"
 #include "xfs_inode.h"
 #include "xfs_bmap.h"
-#include "xfs_da_btree.h"
 #include "xfs_dir_leaf.h"
 #include "xfs_error.h"
 
@@ -192,11 +176,23 @@ xfs_dir_mount(xfs_mount_t *mp)
         uint shortcount, leafcount, count;
 
         mp->m_dirversion = 1;
-        shortcount = (mp->m_attroffset - (uint)sizeof(xfs_dir_sf_hdr_t)) /
-                     (uint)sizeof(xfs_dir_sf_entry_t);
-        leafcount = (XFS_LBSIZE(mp) - (uint)sizeof(xfs_dir_leaf_hdr_t)) /
-                    ((uint)sizeof(xfs_dir_leaf_entry_t) +
-                     (uint)sizeof(xfs_dir_leaf_name_t));
+        if (mp->m_flags & XFS_MOUNT_COMPAT_ATTR) {
+                shortcount = (mp->m_attroffset -
+                                (uint)sizeof(xfs_dir_sf_hdr_t)) /
+                                 (uint)sizeof(xfs_dir_sf_entry_t);
+                leafcount = (XFS_LBSIZE(mp) -
+                                (uint)sizeof(xfs_dir_leaf_hdr_t)) /
+                                 ((uint)sizeof(xfs_dir_leaf_entry_t) +
+                                  (uint)sizeof(xfs_dir_leaf_name_t));
+        } else {
+                shortcount = (XFS_BMDR_SPACE_CALC(MINABTPTRS) -
+                              (uint)sizeof(xfs_dir_sf_hdr_t)) /
+                               (uint)sizeof(xfs_dir_sf_entry_t);
+                leafcount = (XFS_LBSIZE(mp) -
+                            (uint)sizeof(xfs_dir_leaf_hdr_t)) /
+                             ((uint)sizeof(xfs_dir_leaf_entry_t) +
+                              (uint)sizeof(xfs_dir_leaf_name_t));
+        }
         count = shortcount > leafcount ? shortcount : leafcount;
         mp->m_dircook_elog = xfs_da_log2_roundup(count + 1);
         ASSERT(mp->m_dircook_elog <= mp->m_sb.sb_blocklog);