hfsplus journal detection - try 3

hfsplus journal detection - try 3

[Warren Turkal]

Here's the third try for this improved journal detection for HFS+. It
allows the HFS+ volume to be mounted rw with having to use the force
mount option in the case where the journal info block in the volume
header is 0 and journal attribute bit is on. Please review and consider
for inclusion.

Thanks,
wt

[PATCH] Identify journal info block in volume header.

[Warren Turkal]

Signed-off-by: Warren Turkal <wt@penguintechs.org>
---
 fs/hfsplus/hfsplus_raw.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index fe99fe8..14f1dd8 100644
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
@@ -94,7 +94,7 @@ struct hfsplus_vh {
 	__be16 version;
 	__be32 attributes;
 	__be32 last_mount_vers;
-	u32 reserved;
+	__be32 journal_info_block;
 
 	__be32 create_date;
 	__be32 modify_date;
-- 
1.5.6.3

[PATCH] Fix journal detection on HFS+.

[Warren Turkal]

The code was unconditionally assumming that the volume had a jounal if the
jounal attribute was set in the volume header. However, the volume also has to
have a non-zero journal info block to actually have a journal.

Signed-off-by: Warren Turkal <wt@penguintechs.org>
---
 fs/hfsplus/super.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index eb74531..128101b 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -17,9 +17,16 @@
 
 static struct inode *hfsplus_alloc_inode(struct super_block *sb);
 static void hfsplus_destroy_inode(struct inode *inode);
+static bool hfsplus_vol_has_journal(struct hfsplus_vh *vhdr);
 
 #include "hfsplus_fs.h"
 
+static bool hfsplus_vol_has_journal(struct hfsplus_vh *vhdr)
+{
+	return (vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_JOURNALED) &&
+				vhdr->journal_info_block);
+}
+
 struct inode *hfsplus_iget(struct super_block *sb, unsigned long ino)
 {
 	struct hfs_find_data fd;
@@ -260,7 +267,7 @@ static int hfsplus_remount(struct super_block *sb, int *flags, char *data)
 			printk(KERN_WARNING "hfs: filesystem is marked locked, leaving read-only.\n");
 			sb->s_flags |= MS_RDONLY;
 			*flags |= MS_RDONLY;
-		} else if (vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_JOURNALED)) {
+		} else if (hfsplus_vol_has_journal(vhdr)) {
 			printk(KERN_WARNING "hfs: filesystem is marked journaled, leaving read-only.\n");
 			sb->s_flags |= MS_RDONLY;
 			*flags |= MS_RDONLY;
@@ -356,7 +363,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
 	} else if (vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_SOFTLOCK)) {
 		printk(KERN_WARNING "hfs: Filesystem is marked locked, mounting read-only.\n");
 		sb->s_flags |= MS_RDONLY;
-	} else if ((vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_JOURNALED)) && !(sb->s_flags & MS_RDONLY)) {
+	} else if (hfsplus_vol_has_journal(vhdr) && !(sb->s_flags & MS_RDONLY)) {
 		printk(KERN_WARNING "hfs: write access to a journaled filesystem is not supported, "
 		       "use the force option at your own risk, mounting read-only.\n");
 		sb->s_flags |= MS_RDONLY;
-- 
1.5.6.3

hfsplus journal detection - try 4

[Warren Turkal]

Here's another shot at this patch. I found a small issue with sparse.
If this is suitable for inclusion, could someone please pull it into
their tree so that it can be merged upstream?

Thanks,
wt

[PATCH] Identify journal info block in volume header.

[Warren Turkal]

Signed-off-by: Warren Turkal <wt@penguintechs.org>
---
 fs/hfsplus/hfsplus_raw.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index fe99fe8..14f1dd8 100644
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
@@ -94,7 +94,7 @@ struct hfsplus_vh {
 	__be16 version;
 	__be32 attributes;
 	__be32 last_mount_vers;
-	u32 reserved;
+	__be32 journal_info_block;
 
 	__be32 create_date;
 	__be32 modify_date;
-- 
1.5.6.3

Re: [PATCH] Identify journal info block in volume header.

[Andrew Morton]

On Tue, 11 Nov 2008 12:56:46 -0800
Warren Turkal <wt@penguintechs.org> wrote:

> Signed-off-by: Warren Turkal <wt@penguintechs.org>
> ---
>  fs/hfsplus/hfsplus_raw.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
> index fe99fe8..14f1dd8 100644
> --- a/fs/hfsplus/hfsplus_raw.h
> +++ b/fs/hfsplus/hfsplus_raw.h
> @@ -94,7 +94,7 @@ struct hfsplus_vh {
>  	__be16 version;
>  	__be32 attributes;
>  	__be32 last_mount_vers;
> -	u32 reserved;
> +	__be32 journal_info_block;
>  
>  	__be32 create_date;
>  	__be32 modify_date;

Please include a changelog which fully describes the reason for making
this change.

Re: [PATCH] Fix journal detection on HFS+.

[Christoph Hellwig]

On Wed, Nov 05, 2008 at 11:40:54AM +0100, J??rn Engel wrote:
> On Wed, 5 November 2008 00:00:26 -0800, Warren Turkal wrote:
> >
> > +				vhdr->journal_info_block != cpu_to_be32(0)) {
> 
> 0 doesn't need explicit cpu_to_be32().  You can drop the whole
> != cpu_to_be32(0)
> 
> > +			(be32_to_cpu(vhdr->journal_info_block) != 0) &&
> 
> Same here.

Yeah.  In addition adding a little helper that checks both the journal
flag and the non-zeroness of journal_info_block would be useful so that
everyone adding more checks like this in the future get it right.

hfsplus journal detection - next try

[Warren Turkal]

Here is my next stab at this issue. I refactored the logic into a function and
took out the != 0 like you all suggested. Please let me know if there is
anything else I can do to improve it.

Also, I am just getting used to git. Is the best workflow to create a branch
that I cherrypick seemingly acceptable patches into and just createa a different
branch for each patchset attempt?

Thanks,
wt

[PATCH] Identify journal info block in volume header.

[Warren Turkal]

Signed-off-by: Warren Turkal <wt@penguintechs.org>
---
 fs/hfsplus/hfsplus_raw.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index fe99fe8..14f1dd8 100644
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
@@ -94,7 +94,7 @@ struct hfsplus_vh {
 	__be16 version;
 	__be32 attributes;
 	__be32 last_mount_vers;
-	u32 reserved;
+	__be32 journal_info_block;
 
 	__be32 create_date;
 	__be32 modify_date;
-- 
1.5.6.3

hfsplus journal detection

[Warren Turkal]

These small changes change the hfsplus filesystem so that a 0 in the journal
info block of the volume header indicates that there is no journal. This change
allows the such an HFS+ volume to mount in rw mode without needing the force
mount option.

Are there any tips you can give me so that I can make sure I am doing the right
thing to get this into the Linux kernel?

Thanks,
wt

[PATCH] Identify journal info block in volume header.

[Warren Turkal]

Signed-off-by: Warren Turkal <wt@penguintechs.org>
---
 fs/hfsplus/hfsplus_raw.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index fe99fe8..14f1dd8 100644
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
@@ -94,7 +94,7 @@ struct hfsplus_vh {
 	__be16 version;
 	__be32 attributes;
 	__be32 last_mount_vers;
-	u32 reserved;
+	__be32 journal_info_block;
 
 	__be32 create_date;
 	__be32 modify_date;
-- 
1.5.6.3