The patch titled
Subject: fs/affs: replace time_t with time64_t
has been removed from the -mm tree. Its filename was
fs-affs-replace-time_t-with-time64_t.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: DengChao <chao.deng@xxxxxxxxxx>
Subject: fs/affs: replace time_t with time64_t
The affs code uses time_t and get_seconds(). This will cause problems
on 32-bit architectures in 2038 when time_t overflows. This patch
replaces them with time64_t and ktime_get_real_seconds().
Signed-off-by: DengChao <chao.deng@xxxxxxxxxx>
Reviewed-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/affs/affs.h | 2 +-
fs/affs/amigaffs.c | 13 +++++++------
fs/affs/super.c | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff -puN fs/affs/affs.h~fs-affs-replace-time_t-with-time64_t fs/affs/affs.h
--- a/fs/affs/affs.h~fs-affs-replace-time_t-with-time64_t
+++ a/fs/affs/affs.h
@@ -138,7 +138,7 @@ extern int affs_remove_hash(struct inode
extern int affs_remove_header(struct dentry *dentry);
extern u32 affs_checksum_block(struct super_block *sb, struct buffer_head *bh);
extern void affs_fix_checksum(struct super_block *sb, struct buffer_head *bh);
-extern void secs_to_datestamp(time_t secs, struct affs_date *ds);
+extern void secs_to_datestamp(time64_t secs, struct affs_date *ds);
extern umode_t prot_to_mode(u32 prot);
extern void mode_to_prot(struct inode *inode);
__printf(3, 4)
diff -puN fs/affs/amigaffs.c~fs-affs-replace-time_t-with-time64_t fs/affs/amigaffs.c
--- a/fs/affs/amigaffs.c~fs-affs-replace-time_t-with-time64_t
+++ a/fs/affs/amigaffs.c
@@ -8,6 +8,7 @@
* Please send bug reports to: hjw@xxxxxx
*/
+#include <linux/math64.h>
#include "affs.h"
/*
@@ -366,22 +367,22 @@ affs_fix_checksum(struct super_block *sb
}
void
-secs_to_datestamp(time_t secs, struct affs_date *ds)
+secs_to_datestamp(time64_t secs, struct affs_date *ds)
{
u32 days;
u32 minute;
+ s32 rem;
secs -= sys_tz.tz_minuteswest * 60 + ((8 * 365 + 2) * 24 * 60 * 60);
if (secs < 0)
secs = 0;
- days = secs / 86400;
- secs -= days * 86400;
- minute = secs / 60;
- secs -= minute * 60;
+ days = div_s64_rem(secs, 86400, &rem);
+ minute = rem / 60;
+ rem -= minute * 60;
ds->days = cpu_to_be32(days);
ds->mins = cpu_to_be32(minute);
- ds->ticks = cpu_to_be32(secs * 50);
+ ds->ticks = cpu_to_be32(rem * 50);
}
umode_t
diff -puN fs/affs/super.c~fs-affs-replace-time_t-with-time64_t fs/affs/super.c
--- a/fs/affs/super.c~fs-affs-replace-time_t-with-time64_t
+++ a/fs/affs/super.c
@@ -32,7 +32,7 @@ affs_commit_super(struct super_block *sb
struct affs_root_tail *tail = AFFS_ROOT_TAIL(sb, bh);
lock_buffer(bh);
- secs_to_datestamp(get_seconds(), &tail->disk_change);
+ secs_to_datestamp(ktime_get_real_seconds(), &tail->disk_change);
affs_fix_checksum(sb, bh);
unlock_buffer(bh);
_
Patches currently in -mm which might be from chao.deng@xxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
