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

Commit af15a298 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Jan Kara
Browse files

udf: remove unneeded kernel_timestamp type 



remove now unneeded kernel_timestamp type with conversion functions

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 56774805

fs/udf/ecma_167.h

+0 −13
Original line number Diff line number Diff line
@@ -70,19 +70,6 @@ typedef struct { 
	uint8_t		microseconds;

} __attribute__ ((packed)) timestamp;



typedef struct {

	uint16_t	typeAndTimezone;

	int16_t		year;

	uint8_t		month;

	uint8_t		day;

	uint8_t		hour;

	uint8_t		minute;

	uint8_t		second;

	uint8_t		centiseconds;

	uint8_t		hundredsOfMicroseconds;

	uint8_t		microseconds;

} __attribute__ ((packed)) kernel_timestamp;



/* Type and Time Zone (ECMA 167r3 1/7.3.1) */

#define TIMESTAMP_TYPE_MASK		0xF000

#define TIMESTAMP_TYPE_CUT		0x0000

fs/udf/super.c

+5 −4
Original line number Diff line number Diff line
@@ -945,12 +945,13 @@ static void udf_load_pvoldesc(struct super_block *sb, struct buffer_head *bh) 


	if (udf_disk_stamp_to_time(&UDF_SB(sb)->s_record_time,

			      pvoldesc->recordingDateAndTime)) {

		kernel_timestamp ts;

		ts = lets_to_cpu(pvoldesc->recordingDateAndTime);

#ifdef UDFFS_DEBUG

		timestamp *ts = &pvoldesc->recordingDateAndTime;

		udf_debug("recording time %04u/%02u/%02u"

			  " %02u:%02u (%x)\n",

			  ts.year, ts.month, ts.day, ts.hour,

			  ts.minute, ts.typeAndTimezone);

			  le16_to_cpu(ts->year), ts->month, ts->day, ts->hour,

			  ts->minute, le16_to_cpu(ts->typeAndTimezone));

#endif

	}



	if (!udf_build_ustr(&instr, pvoldesc->volIdent, 32))

fs/udf/udfend.h

+0 −22
Original line number Diff line number Diff line
@@ -24,17 +24,6 @@ static inline lb_addr cpu_to_lelb(kernel_lb_addr in) 
	return out;

}



static inline kernel_timestamp lets_to_cpu(timestamp in)

{

	kernel_timestamp out;



	memcpy(&out, &in, sizeof(timestamp));

	out.typeAndTimezone = le16_to_cpu(in.typeAndTimezone);

	out.year = le16_to_cpu(in.year);



	return out;

}



static inline short_ad lesa_to_cpu(short_ad in)

{

	short_ad out;
@@ -85,15 +74,4 @@ static inline kernel_extent_ad leea_to_cpu(extent_ad in) 
	return out;

}



static inline timestamp cpu_to_lets(kernel_timestamp in)

{

	timestamp out;



	memcpy(&out, &in, sizeof(timestamp));

	out.typeAndTimezone = cpu_to_le16(in.typeAndTimezone);

	out.year = cpu_to_le16(in.year);



	return out;

}



#endif /* __UDF_ENDIAN_H */