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

Commit 62a36c43 authored by Stephane Kardas's avatar Stephane Kardas Committed by Linus Torvalds
Browse files

[PATCH] fat: fix adate 



During a forensic analysis on the fat file system, I found than the result for
the last access date on this file system was different between the stat
command and the istat command (package tct-utils).

The istat command display a true date (the right windows date) but the stat
primitive (so stat, find, ls command) displays a wrong date.

Signed-off-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 89d7cbf7

fs/fat/inode.c

+8 −3
Original line number Diff line number Diff line
@@ -300,9 +300,9 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) 
	inode->i_blksize = sbi->cluster_size;

	inode->i_blocks = ((inode->i_size + (sbi->cluster_size - 1))

			   & ~((loff_t)sbi->cluster_size - 1)) >> 9;

	inode->i_mtime.tv_sec = inode->i_atime.tv_sec =

	inode->i_mtime.tv_sec =

		date_dos2unix(le16_to_cpu(de->time), le16_to_cpu(de->date));

	inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;

	inode->i_mtime.tv_nsec = 0;

	if (sbi->options.isvfat) {

		int secs = de->ctime_cs / 100;

		int csecs = de->ctime_cs % 100;
@@ -310,8 +310,11 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) 
			date_dos2unix(le16_to_cpu(de->ctime),

				      le16_to_cpu(de->cdate)) + secs;

		inode->i_ctime.tv_nsec = csecs * 10000000;

		inode->i_atime.tv_sec =

			date_dos2unix(le16_to_cpu(0), le16_to_cpu(de->adate));

		inode->i_atime.tv_nsec = 0;

	} else

		inode->i_ctime = inode->i_mtime;

		inode->i_ctime = inode->i_atime = inode->i_mtime;



	return 0;

}
@@ -513,7 +516,9 @@ static int fat_write_inode(struct inode *inode, int wait) 
	raw_entry->starthi = cpu_to_le16(MSDOS_I(inode)->i_logstart >> 16);

	fat_date_unix2dos(inode->i_mtime.tv_sec, &raw_entry->time, &raw_entry->date);

	if (sbi->options.isvfat) {

		__le16 atime;

		fat_date_unix2dos(inode->i_ctime.tv_sec,&raw_entry->ctime,&raw_entry->cdate);

		fat_date_unix2dos(inode->i_atime.tv_sec,&atime,&raw_entry->adate);

		raw_entry->ctime_cs = (inode->i_ctime.tv_sec & 1) * 100 +

			inode->i_ctime.tv_nsec / 10000000;

	}