git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
fs
/
hfs
/
mdb.c
diff --git
a/fs/hfs/mdb.c
b/fs/hfs/mdb.c
index
cedb9ab
..
4efb640
100644
(file)
--- a/
fs/hfs/mdb.c
+++ b/
fs/hfs/mdb.c
@@
-71,7
+71,7
@@
int hfs_mdb_get(struct super_block *sb)
int off2, len, size, sect;
sector_t part_start, part_size;
loff_t off;
int off2, len, size, sect;
sector_t part_start, part_size;
loff_t off;
-
u
16 attrib;
+
__be
16 attrib;
/* set the device driver to 512-byte blocks */
size = sb_min_blocksize(sb, HFS_SECTOR_SIZE);
/* set the device driver to 512-byte blocks */
size = sb_min_blocksize(sb, HFS_SECTOR_SIZE);
@@
-164,7
+164,7
@@
int hfs_mdb_get(struct super_block *sb)
hfs_warn("hfs_fs: continuing without an alternate MDB\n");
}
hfs_warn("hfs_fs: continuing without an alternate MDB\n");
}
- HFS_SB(sb)->bitmap = (
u
32 *)__get_free_pages(GFP_KERNEL, PAGE_SIZE < 8192 ? 1 : 0);
+ HFS_SB(sb)->bitmap = (
__be
32 *)__get_free_pages(GFP_KERNEL, PAGE_SIZE < 8192 ? 1 : 0);
if (!HFS_SB(sb)->bitmap)
goto out;
if (!HFS_SB(sb)->bitmap)
goto out;
@@
-200,8
+200,7
@@
int hfs_mdb_get(struct super_block *sb)
}
attrib = mdb->drAtrb;
}
attrib = mdb->drAtrb;
- if (!(attrib & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))
- || (attrib & cpu_to_be16(HFS_SB_ATTRIB_INCNSTNT))) {
+ if (!(attrib & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) {
hfs_warn("HFS-fs warning: Filesystem was not cleanly unmounted, "
"running fsck.hfs is recommended. mounting read-only.\n");
sb->s_flags |= MS_RDONLY;
hfs_warn("HFS-fs warning: Filesystem was not cleanly unmounted, "
"running fsck.hfs is recommended. mounting read-only.\n");
sb->s_flags |= MS_RDONLY;
@@
-212,8
+211,9
@@
int hfs_mdb_get(struct super_block *sb)
}
if (!(sb->s_flags & MS_RDONLY)) {
/* Mark the volume uncleanly unmounted in case we crash */
}
if (!(sb->s_flags & MS_RDONLY)) {
/* Mark the volume uncleanly unmounted in case we crash */
- mdb->drAtrb = attrib & cpu_to_be16(~HFS_SB_ATTRIB_UNMNT);
- mdb->drAtrb = attrib | cpu_to_be16(HFS_SB_ATTRIB_INCNSTNT);
+ attrib &= cpu_to_be16(~HFS_SB_ATTRIB_UNMNT);
+ attrib |= cpu_to_be16(HFS_SB_ATTRIB_INCNSTNT);
+ mdb->drAtrb = attrib;
mdb->drWrCnt = cpu_to_be32(be32_to_cpu(mdb->drWrCnt) + 1);
mdb->drLsMod = hfs_mtime();
mdb->drWrCnt = cpu_to_be32(be32_to_cpu(mdb->drWrCnt) + 1);
mdb->drLsMod = hfs_mtime();