Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758340AbYBJK3p (ORCPT ); Sun, 10 Feb 2008 05:29:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755426AbYBJK3i (ORCPT ); Sun, 10 Feb 2008 05:29:38 -0500 Received: from fk-out-0910.google.com ([209.85.128.184]:8456 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755049AbYBJK3h (ORCPT ); Sun, 10 Feb 2008 05:29:37 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=AMqlz7GsR1sWbcOssLpFwzkBTG/Dg3Dk7YFnIFnPnbcL7WlchiBYJPbK6gxmYPYhy205FV9Ql4kCTGA7Opno+yab0j19MBvIMbBg9pN1FVTp/xGrvhUrF8EXTO9uO1T8bqbi8oqJdRaEMS4TELyP+NT9M1CVF7gVR2zUFR+DUFs= Date: Sun, 10 Feb 2008 11:29:10 +0100 From: Marcin Slusarz To: Jan Kara Cc: LKML Subject: Re: [PATCH 5/6] udf: remove unneeded kernel_timestamp type Message-ID: <20080210102900.GF6737@joi> References: <1202063771-18172-1-git-send-email-marcin.slusarz@gmail.com> <1202063771-18172-6-git-send-email-marcin.slusarz@gmail.com> <20080205160115.GJ25464@duck.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080205160115.GJ25464@duck.suse.cz> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3320 Lines: 112 On Tue, Feb 05, 2008 at 05:01:15PM +0100, Jan Kara wrote: > On Sun 03-02-08 19:36:10, marcin.slusarz@gmail.com wrote: > > remove now unneeded kernel_timestamp type with conversion functions > OK. Acked-by: Jan Kara updated version which aplies after changes to patch: udf: convert udf_stamp_to_time and udf_time_to_stamp to use timestamps --- udf: remove unneeded kernel_timestamp type remove now unneeded kernel_timestamp type with conversion functions Signed-off-by: Marcin Slusarz Acked-by: Jan Kara --- 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 ab63dbb..56d9efb 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -982,12 +982,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)) 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/