lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

udf: improve readability of udf_load_partition

Browse Source 
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Marcin Slusarz
2008-02-08 04:20:46 -08:00
committed by Linus Torvalds
parent 756fa92f4d
commit 28f7c4d413
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
fs/udf/super.c
View File

@@ -1447,44 +1447,45 @@ static int udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset)
sbi = UDF_SB(sb); sbi = UDF_SB(sb);
for (i = 0; i < ARRAY_SIZE(sbi->s_anchor); i++) { for (i = 0; i < ARRAY_SIZE(sbi->s_anchor); i++) {
if (sbi->s_anchor[i] && if (!sbi->s_anchor[i])
(bh = udf_read_tagged(sb, sbi->s_anchor[i], continue;
sbi->s_anchor[i], &ident))) { bh = udf_read_tagged(sb, sbi->s_anchor[i], sbi->s_anchor[i],
anchor = (struct anchorVolDescPtr *)bh->b_data; &ident);
if (!bh)
continue;
/* Locate the main sequence */ anchor = (struct anchorVolDescPtr *)bh->b_data;
main_s = le32_to_cpu(
anchor->mainVolDescSeqExt.extLocation);
main_e = le32_to_cpu(
anchor->mainVolDescSeqExt.extLength);
main_e = main_e >> sb->s_blocksize_bits;
main_e += main_s;
/* Locate the reserve sequence */ /* Locate the main sequence */
reserve_s = le32_to_cpu( main_s = le32_to_cpu(anchor->mainVolDescSeqExt.extLocation);
main_e = le32_to_cpu(anchor->mainVolDescSeqExt.extLength);
main_e = main_e >> sb->s_blocksize_bits;
main_e += main_s;
/* Locate the reserve sequence */
reserve_s = le32_to_cpu(
anchor->reserveVolDescSeqExt.extLocation); anchor->reserveVolDescSeqExt.extLocation);
reserve_e = le32_to_cpu( reserve_e = le32_to_cpu(
anchor->reserveVolDescSeqExt.extLength); anchor->reserveVolDescSeqExt.extLength);
reserve_e = reserve_e >> sb->s_blocksize_bits; reserve_e = reserve_e >> sb->s_blocksize_bits;
reserve_e += reserve_s; reserve_e += reserve_s;
brelse(bh); brelse(bh);
/* Process the main & reserve sequences */ /* Process the main & reserve sequences */
/* responsible for finding the PartitionDesc(s) */ /* responsible for finding the PartitionDesc(s) */
if (!(udf_process_sequence(sb, main_s, main_e, if (!(udf_process_sequence(sb, main_s, main_e,
fileset) && fileset) &&
udf_process_sequence(sb, reserve_s, reserve_e, udf_process_sequence(sb, reserve_s, reserve_e,
fileset))) fileset)))
break; break;
}
} }
if (i == ARRAY_SIZE(sbi->s_anchor)) { if (i == ARRAY_SIZE(sbi->s_anchor)) {
udf_debug("No Anchor block found\n"); udf_debug("No Anchor block found\n");
return 1; return 1;
} else }
udf_debug("Using anchor in block %d\n", sbi->s_anchor[i]); udf_debug("Using anchor in block %d\n", sbi->s_anchor[i]);
for (i = 0; i < sbi->s_partitions; i++) { for (i = 0; i < sbi->s_partitions; i++) {
kernel_lb_addr uninitialized_var(ino); kernel_lb_addr uninitialized_var(ino);