Re: [PATCH 5/6] udf: remove unneeded kernel_timestamp type

[Jan Kara]

On Sun 03-02-08 19:36:10, marcin.slusarz@xxxxxxxxx wrote:
> remove now unneeded kernel_timestamp type with conversion functions
  OK. Acked-by: Jan Kara <jack@xxxxxxx>

								Honza
> 
> Signed-off-by: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
> Cc: Jan Kara <jack@xxxxxxx>
> ---
>  fs/udf/ecma_167.h |   13 -------------
>  fs/udf/super.c    |    9 +++++----
>  fs/udf/udfend.h   |   22 ----------------------
>  3 files changed, 5 insertions(+), 39 deletions(-)
> 
> diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h
> index 5638771..a0974df 100644
> --- a/fs/udf/ecma_167.h
> +++ b/fs/udf/ecma_167.h
> @@ -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
> diff --git a/fs/udf/super.c b/fs/udf/super.c
> index 8a98a2e..3a7faad 100644
> --- a/fs/udf/super.c
> +++ b/fs/udf/super.c
> @@ -916,12 +916,13 @@ static void udf_load_pvoldesc(struct super_block *sb, struct buffer_head *bh)
>  
>  	if (udf_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))
> diff --git a/fs/udf/udfend.h b/fs/udf/udfend.h
> index c4bd120..489f52f 100644
> --- a/fs/udf/udfend.h
> +++ b/fs/udf/udfend.h
> @@ -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 */
> -- 
> 1.5.3.7
> 
-- 
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/