Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28f7c4d4 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Linus Torvalds
Browse files

udf: improve readability of udf_load_partition



Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Acked-by: default avatarJan Kara <jack@suse.cz>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 756fa92f
Loading
Loading
Loading
Loading
+30 −29
Original line number Diff line number Diff line
@@ -1447,16 +1447,18 @@ static int udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset)
	sbi = UDF_SB(sb);

	for (i = 0; i < ARRAY_SIZE(sbi->s_anchor); i++) {
		if (sbi->s_anchor[i] &&
		    (bh = udf_read_tagged(sb, sbi->s_anchor[i],
					  sbi->s_anchor[i], &ident))) {
		if (!sbi->s_anchor[i])
			continue;
		bh = udf_read_tagged(sb, sbi->s_anchor[i], sbi->s_anchor[i],
				     &ident);
		if (!bh)
			continue;

		anchor = (struct anchorVolDescPtr *)bh->b_data;

		/* Locate the main sequence */
			main_s = le32_to_cpu(
					anchor->mainVolDescSeqExt.extLocation);
			main_e = le32_to_cpu(
					anchor->mainVolDescSeqExt.extLength);
		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;

@@ -1478,12 +1480,11 @@ static int udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset)
					   fileset)))
			break;
	}
	}

	if (i == ARRAY_SIZE(sbi->s_anchor)) {
		udf_debug("No Anchor block found\n");
		return 1;
	} else
	}
	udf_debug("Using anchor in block %d\n", sbi->s_anchor[i]);

	for (i = 0; i < sbi->s_partitions; i++) {