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

Commit b1e7a4b1 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Linus Torvalds
Browse files

UDF: coding style fixups 



This patch does additional coding style fixup.  Initially the code is being
distorted by Lindent (in my patches sent not very long ago) and fixed in
the followup patches but this stuff was accidently missed.

New and old compiled files were compared with cmp to check for being
identically.  So the patch will not break the kernel.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d7b52df

fs/udf/super.c

+19 −32
Original line number Original line Diff line number Diff line
@@ -913,8 +913,7 @@ static int udf_load_partdesc(struct super_block *sb, struct buffer_head *bh) 
					UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table =

					UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table =

						udf_iget(sb, loc);

						udf_iget(sb, loc);

					if (!UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table) {

					if (!UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table) {

						udf_debug("cannot load unallocSpaceTable (part %d)\n",

						udf_debug("cannot load unallocSpaceTable (part %d)\n", i);

							i);

						return 1;

						return 1;

					}

					}

					UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_UNALLOC_TABLE;

					UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_UNALLOC_TABLE;
@@ -944,8 +943,7 @@ static int udf_load_partdesc(struct super_block *sb, struct buffer_head *bh) 
					UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table =

					UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table =

						udf_iget(sb, loc);

						udf_iget(sb, loc);

					if (!UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table) {

					if (!UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table) {

						udf_debug("cannot load freedSpaceTable (part %d)\n",

						udf_debug("cannot load freedSpaceTable (part %d)\n", i);

							i);

						return 1;

						return 1;

					}

					}

					UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_FREED_TABLE;

					UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_FREED_TABLE;
@@ -1298,14 +1296,11 @@ static int udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset) 
			}

			}





			for (j = 0; j < UDF_SB_NUMPARTS(sb); j++) {

			for (j = 0; j < UDF_SB_NUMPARTS(sb); j++) {

				if (j != i && UDF_SB_PARTVSN(sb, i) ==

				if (j != i &&

					UDF_SB_PARTVSN(sb, j) &&

				    UDF_SB_PARTVSN(sb, i) == UDF_SB_PARTVSN(sb, j) &&

				    	UDF_SB_PARTNUM(sb, i) ==

				    UDF_SB_PARTNUM(sb, i) == UDF_SB_PARTNUM(sb, j)) {

						UDF_SB_PARTNUM(sb, j)) {

					ino.partitionReferenceNum = j;

					ino.partitionReferenceNum = j;

					ino.logicalBlockNum =

					ino.logicalBlockNum = UDF_SB_LASTBLOCK(sb) - UDF_SB_PARTROOT(sb, j);

					    UDF_SB_LASTBLOCK(sb) -

					    UDF_SB_PARTROOT(sb, j);

					break;

					break;

				}

				}

			}

			}
@@ -1330,19 +1325,15 @@ static int udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset) 
				if (!bh)

				if (!bh)

					return 1;

					return 1;

				UDF_SB_TYPEVIRT(sb, i).s_start_offset =

				UDF_SB_TYPEVIRT(sb, i).s_start_offset =

				    le16_to_cpu(((struct

					le16_to_cpu(((struct virtualAllocationTable20 *)bh->b_data +

					virtualAllocationTable20 *)bh->b_data +

						     udf_ext0_offset(UDF_SB_VAT(sb)))->lengthHeader) +

					  udf_ext0_offset(UDF_SB_VAT(sb)))->

						lengthHeader) +

					udf_ext0_offset(UDF_SB_VAT(sb));

					udf_ext0_offset(UDF_SB_VAT(sb));

				UDF_SB_TYPEVIRT(sb, i).s_num_entries =

				UDF_SB_TYPEVIRT(sb, i).s_num_entries = (UDF_SB_VAT(sb)->i_size -

				    (UDF_SB_VAT(sb)->i_size -

									UDF_SB_TYPEVIRT(sb, i).s_start_offset) >> 2;

									UDF_SB_TYPEVIRT(sb, i).s_start_offset) >> 2;

				brelse(bh);

				brelse(bh);

			}

			}

			UDF_SB_PARTROOT(sb, i) = udf_get_pblock(sb, 0, i, 0);

			UDF_SB_PARTROOT(sb, i) = udf_get_pblock(sb, 0, i, 0);

			UDF_SB_PARTLEN(sb, i) = UDF_SB_PARTLEN(sb,

			UDF_SB_PARTLEN(sb, i) = UDF_SB_PARTLEN(sb, ino.partitionReferenceNum);

						ino.partitionReferenceNum);

		}

		}

	}

	}

	return 0;

	return 0;
@@ -1357,21 +1348,17 @@ static void udf_open_lvid(struct super_block *sb) 
		UDF_SB_LVIDIU(sb)->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;

		UDF_SB_LVIDIU(sb)->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;

		UDF_SB_LVIDIU(sb)->impIdent.identSuffix[1] = UDF_OS_ID_LINUX;

		UDF_SB_LVIDIU(sb)->impIdent.identSuffix[1] = UDF_OS_ID_LINUX;

		if (udf_time_to_stamp(&cpu_time, CURRENT_TIME))

		if (udf_time_to_stamp(&cpu_time, CURRENT_TIME))

			UDF_SB_LVID(sb)->recordingDateAndTime =

			UDF_SB_LVID(sb)->recordingDateAndTime = cpu_to_lets(cpu_time);

			    cpu_to_lets(cpu_time);

		UDF_SB_LVID(sb)->integrityType = LVID_INTEGRITY_TYPE_OPEN;

		UDF_SB_LVID(sb)->integrityType = LVID_INTEGRITY_TYPE_OPEN;





		UDF_SB_LVID(sb)->descTag.descCRC =

		UDF_SB_LVID(sb)->descTag.descCRC = cpu_to_le16(udf_crc((char *)UDF_SB_LVID(sb) + sizeof(tag),

		    cpu_to_le16(udf_crc((char *)UDF_SB_LVID(sb) + sizeof(tag),

								       le16_to_cpu(UDF_SB_LVID(sb)->descTag.descCRCLength), 0));

					le16_to_cpu(UDF_SB_LVID(sb)->descTag.

						    descCRCLength), 0));





		UDF_SB_LVID(sb)->descTag.tagChecksum = 0;

		UDF_SB_LVID(sb)->descTag.tagChecksum = 0;

		for (i = 0; i < 16; i++)

		for (i = 0; i < 16; i++)

			if (i != 4)

			if (i != 4)

				UDF_SB_LVID(sb)->descTag.tagChecksum +=

				UDF_SB_LVID(sb)->descTag.tagChecksum +=

				    ((uint8_t *) &

					((uint8_t *) &(UDF_SB_LVID(sb)->descTag))[i];

				     (UDF_SB_LVID(sb)->descTag))[i];





		mark_buffer_dirty(UDF_SB_LVIDBH(sb));

		mark_buffer_dirty(UDF_SB_LVIDBH(sb));

	}

	}

fs/udf/udftime.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -108,10 +108,10 @@ time_t *udf_stamp_to_time(time_t *dest, long *dest_usec, kernel_timestamp src) 
	*dest = year_seconds[src.year - EPOCH_YEAR];

	*dest = year_seconds[src.year - EPOCH_YEAR];

	*dest -= offset * 60;

	*dest -= offset * 60;





	yday = ((__mon_yday[__isleap (src.year)]

	yday = ((__mon_yday[__isleap(src.year)][src.month - 1]) + src.day - 1);

		 [src.month - 1]) + (src.day - 1));

	*dest += (((yday * 24) + src.hour) * 60 + src.minute) * 60 + src.second;

	*dest += (((yday * 24) + src.hour) * 60 + src.minute) * 60 + src.second;

	*dest_usec = src.centiseconds * 10000 + src.hundredsOfMicroseconds * 100 + src.microseconds;

	*dest_usec = src.centiseconds * 10000 +

			src.hundredsOfMicroseconds * 100 + src.microseconds;

	return dest;

	return dest;

}

}