summaryrefslogtreecommitdiffstats
path: root/fs/hfsplus/hfsplus_raw.h
diff options
context:
space:
mode:
authorRoman Zippel2005-11-30 04:34:41 +0100
committerLinus Torvalds2005-11-30 04:47:03 +0100
commitb0b623c3b22d57d6941b200321779d56c4e79e6b (patch)
treea2d9a2e047ff4cb5a9f7123084a00b2c3ecc23fa /fs/hfsplus/hfsplus_raw.h
parent[PATCH] reiserfs: handle cnode allocation failure gracefully (diff)
downloadkernel-qcow2-linux-b0b623c3b22d57d6941b200321779d56c4e79e6b.tar.gz
kernel-qcow2-linux-b0b623c3b22d57d6941b200321779d56c4e79e6b.tar.xz
kernel-qcow2-linux-b0b623c3b22d57d6941b200321779d56c4e79e6b.zip
[PATCH] hfsplus: don't modify journaled volume
Access to a journaled HFS+ volume is not officially supported under Linux, so mount such a volume read-only, but users can override this behaviour using the "force" mount option. The minimum requirement to relax this check is to at least check that the journal is empty and so nothing needs to be replayed to make sure the volume is consistent. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/hfsplus/hfsplus_raw.h')
-rw-r--r--fs/hfsplus/hfsplus_raw.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index 5bad37cfdb29..b4fbed633219 100644
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
@@ -123,11 +123,13 @@ struct hfsplus_vh {
} __packed;
/* HFS+ volume attributes */
-#define HFSPLUS_VOL_UNMNT (1 << 8)
-#define HFSPLUS_VOL_SPARE_BLK (1 << 9)
-#define HFSPLUS_VOL_NOCACHE (1 << 10)
-#define HFSPLUS_VOL_INCNSTNT (1 << 11)
-#define HFSPLUS_VOL_SOFTLOCK (1 << 15)
+#define HFSPLUS_VOL_UNMNT (1 << 8)
+#define HFSPLUS_VOL_SPARE_BLK (1 << 9)
+#define HFSPLUS_VOL_NOCACHE (1 << 10)
+#define HFSPLUS_VOL_INCNSTNT (1 << 11)
+#define HFSPLUS_VOL_NODEID_REUSED (1 << 12)
+#define HFSPLUS_VOL_JOURNALED (1 << 13)
+#define HFSPLUS_VOL_SOFTLOCK (1 << 15)
/* HFS+ BTree node descriptor */
struct hfs_bnode_desc {