| title: | Re PATCH RFC resend isofs work around |
|
On Tuesday 31 August 2010 22:44:55 Guenter Roeck wrote:
On Tue, 2010-08-31 at 14:10 -0400, Ondrej Zary wrote:
If a CD has both Rock Ridge and Joliet extensions and the ISO root
directory is empty, no files are visible. Disable Rock Ridge extensions
in this case and use Joliet root directory instead.
Signed-off-by: Ondrej Zary <linux@xxxxxxxxxxxxxxxxxxxx
--- linux-2.6.35-rc2/fs/isofs/inode.c 2010-06-06 05:43:24.000000000 +0200
+++ linux-2.6.35-rc3/fs/isofs/inode.c 2010-08-24 22:43:26.000000000 +0200
@@ -549,6 +549,34 @@ static unsigned int isofs_get_last_sessi
}
/*
+ * Check if root directory is empty (has less than 3 files).
+ *
+ * Used to detect broken CDs where ISO root directory is empty but
Joliet root + * directory is OK. If such CD has Rock Ridge extensions,
they will be disabled + * (and Joliet used instead) or else no files
would be visible. + */
+static bool rootdir_empty(struct super_block *sb, unsigned long block)
+{
+ int offset, files, de_len;
+ struct iso_directory_record *de;
+ struct buffer_head *bh;
+
+ bh = sb_bread(sb, block);
+ if (!bh)
+ return true;
+ while (files < 3) {
files is uninitialized.
+ de = (struct iso_directory_record *) (bh- b_data + offset);
offset is uninitialized.
Did you test this patch ?
Oops... I tested it and it seemed to work fine. Even gcc did not complain...
--
Ondrej Zary
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at rel="nofollow" vger.kernel.org/majordomo-info.html vger.kernel.org/majordomo-info.html
|
