diff options
| author | Deepa Dinamani <deepa.kernel@gmail.com> | 2018-05-10 08:26:17 -0700 |
|---|---|---|
| committer | Deepa Dinamani <deepa.kernel@gmail.com> | 2018-05-25 15:31:14 -0700 |
| commit | 0220eddac66daa2afdd6cf6d7d5198226d2abf0b (patch) | |
| tree | 43e5e612c0386d2e4a3afd59cf5c9cecccbf393b /fs/udf/super.c | |
| parent | 0a2dfbecb36119c3fa7d815308c6aa90789bbf02 (diff) | |
| download | talos-obmc-linux-0220eddac66daa2afdd6cf6d7d5198226d2abf0b.tar.gz talos-obmc-linux-0220eddac66daa2afdd6cf6d7d5198226d2abf0b.zip | |
udf: Simplify calls to udf_disk_stamp_to_time
Subsequent patches in the series convert inode timestamps
to use struct timespec64 instead of struct timespec as
part of solving the y2038 problem.
commit fd3cfad374d4 ("udf: Convert udf_disk_stamp_to_time() to use mktime64()")
eliminated the NULL return condition from udf_disk_stamp_to_time().
udf_time_to_disk_time() is always called with a valid dest pointer and
the return value is ignored.
Further, caller can as well check the dest pointer being passed in rather
than return argument.
Make both the functions return void.
This will make the inode timestamp conversion simpler.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: jack@suse.com
----
Changes from v1:
* fixed the pointer error pointed by Jan
Diffstat (limited to 'fs/udf/super.c')
| -rw-r--r-- | fs/udf/super.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 7949c338efa5..8449e5190530 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -864,6 +864,9 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block) struct buffer_head *bh; uint16_t ident; int ret = -ENOMEM; +#ifdef UDFFS_DEBUG + struct timestamp *ts; +#endif outstr = kmalloc(128, GFP_NOFS); if (!outstr) @@ -882,15 +885,15 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block) pvoldesc = (struct primaryVolDesc *)bh->b_data; - if (udf_disk_stamp_to_time(&UDF_SB(sb)->s_record_time, - pvoldesc->recordingDateAndTime)) { + udf_disk_stamp_to_time(&UDF_SB(sb)->s_record_time, + pvoldesc->recordingDateAndTime); #ifdef UDFFS_DEBUG - struct timestamp *ts = &pvoldesc->recordingDateAndTime; - udf_debug("recording time %04u/%02u/%02u %02u:%02u (%x)\n", - le16_to_cpu(ts->year), ts->month, ts->day, ts->hour, - ts->minute, le16_to_cpu(ts->typeAndTimezone)); + ts = &pvoldesc->recordingDateAndTime; + udf_debug("recording time %04u/%02u/%02u %02u:%02u (%x)\n", + le16_to_cpu(ts->year), ts->month, ts->day, ts->hour, + ts->minute, le16_to_cpu(ts->typeAndTimezone)); #endif - } + ret = udf_dstrCS0toUTF8(outstr, 31, pvoldesc->volIdent, 32); if (ret < 0) |
