X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fadfs%2Fsuper.c;h=252abda0d200cc6fc5e7531e99054e2a3e88eb17;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=e9462e76ac4cda57aa2b63aaf6b0cf271ed2ddb7;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index e9462e76a..252abda0d 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -19,8 +19,8 @@
 #include <linux/buffer_head.h>
 #include <linux/vfs.h>
 #include <linux/parser.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
@@ -62,7 +62,7 @@ static int adfs_checkdiscrecord(struct adfs_discrecord *dr)
 	 * are unable to represent sector offsets in
 	 * 32 bits.  This works out at 2.0 TB.
 	 */
-	if (dr->disc_size_high >> dr->log2secsize)
+	if (le32_to_cpu(dr->disc_size_high) >> dr->log2secsize)
 		return 1;
 
 	/* idlen must be no greater than 19 v2 [1.0] */
@@ -241,7 +241,8 @@ static int init_inodecache(void)
 {
 	adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
 					     sizeof(struct adfs_inode_info),
-					     0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
+					     0, (SLAB_RECLAIM_ACCOUNT|
+						SLAB_MEM_SPREAD),
 					     init_once, NULL);
 	if (adfs_inode_cachep == NULL)
 		return -ENOMEM;
@@ -300,8 +301,8 @@ static struct adfs_discmap *adfs_read_map(struct super_block *sb, struct adfs_di
 	i = zone - 1;
 	dm[0].dm_startblk = 0;
 	dm[0].dm_startbit = ADFS_DR_SIZE_BITS;
-	dm[i].dm_endbit   = (dr->disc_size_high << (32 - dr->log2bpmb)) +
-			    (dr->disc_size >> dr->log2bpmb) +
+	dm[i].dm_endbit   = (le32_to_cpu(dr->disc_size_high) << (32 - dr->log2bpmb)) +
+			    (le32_to_cpu(dr->disc_size) >> dr->log2bpmb) +
 			    (ADFS_DR_SIZE_BITS - i * zone_size);
 
 	if (adfs_checkmap(sb, dm))
@@ -439,7 +440,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
 	 * get the root_size from the disc record.
 	 */
 	if (asb->s_version) {
-		root_obj.size = dr->root_size;
+		root_obj.size = le32_to_cpu(dr->root_size);
 		asb->s_dir     = &adfs_fplus_dir_ops;
 		asb->s_namelen = ADFS_FPLUS_NAME_LEN;
 	} else {