From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: tytso@mit.edu, darrick.wong@oracle.com
Cc: linux-ext4@vger.kernel.org
Subject: [PATCH 28/32] fuse2fs: handle 64-bit dates correctly
Date: Sat, 01 Mar 2014 23:19:39 -0800 [thread overview]
Message-ID: <20140302071939.28217.80991.stgit@birch.djwong.org> (raw)
In-Reply-To: <20140302071639.28217.57302.stgit@birch.djwong.org>
Fix fuse2fs' interpretation of 64-bit date quantities to match the
kernel.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
misc/fuse2fs.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index a790d85..2b4a489 100644
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -321,15 +321,24 @@ static int __translate_error(ext2_filsys fs, errcode_t err, ext2_ino_t ino,
static inline __u32 ext4_encode_extra_time(const struct timespec *time)
{
- return (sizeof(time->tv_sec) > 4 ?
- (time->tv_sec >> 32) & EXT4_EPOCH_MASK : 0) |
- ((time->tv_nsec << EXT4_EPOCH_BITS) & EXT4_NSEC_MASK);
+ __u32 extra = sizeof(time->tv_sec) > 4 ?
+ ((time->tv_sec - (__s32)time->tv_sec) >> 32) &
+ EXT4_EPOCH_MASK : 0;
+ return extra | (time->tv_nsec << EXT4_EPOCH_BITS);
}
static inline void ext4_decode_extra_time(struct timespec *time, __u32 extra)
{
- if (sizeof(time->tv_sec) > 4)
- time->tv_sec |= (__u64)((extra) & EXT4_EPOCH_MASK) << 32;
+ if (sizeof(time->tv_sec) > 4 && (extra & EXT4_EPOCH_MASK)) {
+ __u64 extra_bits = extra & EXT4_EPOCH_MASK;
+ /*
+ * Prior to kernel 3.14?, we had a broken decode function,
+ * wherein we effectively did this:
+ * if (extra_bits == 3)
+ * extra_bits = 0;
+ */
+ time->tv_sec += extra_bits << 32;
+ }
time->tv_nsec = ((extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS;
}
@@ -355,7 +364,7 @@ do { \
(timespec)->tv_sec = (signed)((raw_inode)->xtime); \
if (EXT4_FITS_IN_INODE(raw_inode, xtime ## _extra)) \
ext4_decode_extra_time((timespec), \
- raw_inode->xtime ## _extra); \
+ (raw_inode)->xtime ## _extra); \
else \
(timespec)->tv_nsec = 0; \
} while (0)
@@ -717,6 +726,7 @@ static int stat_inode(ext2_filsys fs, ext2_ino_t ino, struct stat *statbuf)
dev_t fakedev = 0;
errcode_t err;
int ret = 0;
+ struct timespec tv;
memset(&inode, 0, sizeof(inode));
err = ext2fs_read_inode_full(fs, ino, (struct ext2_inode *)&inode,
@@ -734,9 +744,12 @@ static int stat_inode(ext2_filsys fs, ext2_ino_t ino, struct stat *statbuf)
statbuf->st_size = EXT2_I_SIZE(&inode);
statbuf->st_blksize = fs->blocksize;
statbuf->st_blocks = blocks_from_inode(fs, &inode);
- statbuf->st_atime = inode.i_atime;
- statbuf->st_mtime = inode.i_mtime;
- statbuf->st_ctime = inode.i_ctime;
+ EXT4_INODE_GET_XTIME(i_atime, &tv, &inode);
+ statbuf->st_atime = tv.tv_sec;
+ EXT4_INODE_GET_XTIME(i_mtime, &tv, &inode);
+ statbuf->st_mtime = tv.tv_sec;
+ EXT4_INODE_GET_XTIME(i_ctime, &tv, &inode);
+ statbuf->st_ctime = tv.tv_sec;
if (LINUX_S_ISCHR(inode.i_mode) ||
LINUX_S_ISBLK(inode.i_mode)) {
if (inode.i_block[0])
next prev parent reply other threads:[~2014-03-02 7:19 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-02 7:16 [PATCH 00/32] e2fsprogs patchbomb 2/14 Darrick J. Wong
2014-03-02 7:16 ` [PATCH 01/32] libext2fs: support modifying arbitrary extended attributes (v5) Darrick J. Wong
2014-03-02 7:16 ` [PATCH 02/32] debugfs: create commands to edit extended attributes Darrick J. Wong
2014-03-02 7:16 ` [PATCH 03/32] libext2fs: fix 64bit overflow in ext2fs_block_alloc_stats_range Darrick J. Wong
2014-03-02 7:17 ` [PATCH 04/32] misc: fix header complaints and resource leaks in e2fsprogs Darrick J. Wong
2014-03-02 7:17 ` [PATCH 05/32] libext2fs: fix memory leak when drastically shrinking extent tree depth Darrick J. Wong
2014-03-02 7:17 ` [PATCH 06/32] libext2fs: fix parents when modifying extents Darrick J. Wong
2014-03-02 7:17 ` [PATCH 07/32] e2fsck: fix inline_data flag errors in pass1 Darrick J. Wong
2014-03-02 7:17 ` [PATCH 08/32] e2fsck: print runs of duplicate blocks instead of all of them Darrick J. Wong
2014-03-02 7:17 ` [PATCH 09/32] e2fsck: verify checksums after checking everything else Darrick J. Wong
2014-03-02 7:17 ` [PATCH 10/32] dumpe2fs: add switch to disable checksum verification Darrick J. Wong
2014-03-02 7:17 ` [PATCH 11/32] mke2fs: set block_validity as a default mount option Darrick J. Wong
2014-03-02 7:17 ` [PATCH 12/32] libext2fs: support allocating uninit blocks in bmap2() Darrick J. Wong
2014-03-02 7:18 ` [PATCH 13/32] libext2fs: file IO routines should handle uninit blocks Darrick J. Wong
2014-03-02 7:18 ` [PATCH 14/32] resize2fs: convert fs to and from 64bit mode Darrick J. Wong
2014-03-02 7:18 ` [PATCH 15/32] resize2fs: when toggling 64bit, don't free in-use bg data clusters Darrick J. Wong
2014-03-02 7:18 ` [PATCH 16/32] resize2fs: adjust reserved_gdt_blocks when changing group descriptor size Darrick J. Wong
2014-03-02 7:18 ` [PATCH 17/32] libext2fs: have UNIX IO manager use pread/pwrite Darrick J. Wong
2014-03-02 7:18 ` [PATCH 18/32] ext2fs: add readahead method to improve scanning Darrick J. Wong
2014-03-02 7:18 ` [PATCH 19/32] libext2fs: allow clients to read-ahead metadata Darrick J. Wong
2014-03-02 7:18 ` [PATCH 20/32] e2fsck: read-ahead metadata during passes 1, 2, and 4 Darrick J. Wong
2014-03-02 7:18 ` [PATCH 21/32] libext2fs: when appending to a file, don't split an index block in equal halves Darrick J. Wong
2014-03-02 7:18 ` [PATCH 22/32] libext2fs: find inode goal when allocating blocks Darrick J. Wong
2014-03-02 7:19 ` [PATCH 23/32] libext2fs: find a range of empty blocks Darrick J. Wong
2014-03-02 7:19 ` [PATCH 24/32] libext2fs: provide a function to set inode size Darrick J. Wong
2014-03-02 7:19 ` [PATCH 25/32] libext2fs: implement fallocate Darrick J. Wong
2014-03-02 7:19 ` [PATCH 27/32] fuse2fs: translate ACL structures Darrick J. Wong
2014-03-02 7:19 ` Darrick J. Wong [this message]
2014-03-02 7:19 ` [PATCH 29/32] fuse2fs: implement fallocate Darrick J. Wong
2014-03-02 7:19 ` [PATCH 31/32] tests: enable using fuse2fs with metadata checksum test Darrick J. Wong
2014-03-02 7:20 ` [PATCH 32/32] tests: test date handling Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140302071939.28217.80991.stgit@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).