From: Deepa Dinamani <deepa.kernel@gmail.com>
To: viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, arnd@arndb.de,
hirofumi@mail.parknet.co.jp
Subject: [PATCH v2 1/6] fs: fat: Eliminate timespec64_trunc() usage
Date: Mon, 2 Dec 2019 21:19:40 -0800 [thread overview]
Message-ID: <20191203051945.9440-2-deepa.kernel@gmail.com> (raw)
In-Reply-To: <20191203051945.9440-1-deepa.kernel@gmail.com>
timespec64_trunc() is being deleted.
timestamp_truncate() is the replacement api for
timespec64_trunc. timestamp_truncate() additionally clamps
timestamps to make sure the timestamps lie within the
permitted range for the filesystem.
But, fat always truncates the times locally after it obtains
the timestamps from current_time().
Implement a local version here along the lines of existing
truncate functions.
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: hirofumi@mail.parknet.co.jp
---
fs/fat/misc.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 1e08bd54c5fb..f1b2a1fc2a6a 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -271,6 +271,14 @@ static inline struct timespec64 fat_timespec64_trunc_2secs(struct timespec64 ts)
{
return (struct timespec64){ ts.tv_sec & ~1ULL, 0 };
}
+
+static inline struct timespec64 fat_timespec64_trunc_10ms(struct timespec64 ts)
+{
+ if (ts.tv_nsec)
+ ts.tv_nsec -= ts.tv_nsec % 10000000UL;
+ return ts;
+}
+
/*
* truncate the various times with appropriate granularity:
* root inode:
@@ -308,7 +316,7 @@ int fat_truncate_time(struct inode *inode, struct timespec64 *now, int flags)
}
if (flags & S_CTIME) {
if (sbi->options.isvfat)
- inode->i_ctime = timespec64_trunc(*now, 10000000);
+ inode->i_ctime = fat_timespec64_trunc_10ms(*now);
else
inode->i_ctime = fat_timespec64_trunc_2secs(*now);
}
--
2.17.1
next prev parent reply other threads:[~2019-12-03 5:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 5:19 [PATCH v2 0/6] Delete timespec64_trunc() Deepa Dinamani
2019-12-03 5:19 ` Deepa Dinamani [this message]
2019-12-03 5:19 ` [PATCH v2 2/6] fs: cifs: Delete usage of timespec64_trunc Deepa Dinamani
2019-12-03 5:19 ` [PATCH v2 3/6] fs: ceph: Delete timespec64_trunc() usage Deepa Dinamani
2019-12-03 18:55 ` Jeff Layton
2019-12-03 19:41 ` Deepa Dinamani
2019-12-03 19:49 ` Jeff Layton
2019-12-03 5:19 ` [PATCH v2 4/6] fs: ubifs: Eliminate " Deepa Dinamani
2019-12-03 5:19 ` [PATCH v2 5/6] fs: Delete timespec64_trunc() Deepa Dinamani
2019-12-03 5:19 ` [PATCH v2 6/6] fs: Do not overload update_time Deepa Dinamani
2019-12-06 2:43 ` [PATCH v2 0/6] Delete timespec64_trunc() Deepa Dinamani
2019-12-07 6:02 ` Al Viro
2019-12-08 2:04 ` Deepa Dinamani
2019-12-08 3:04 ` Al Viro
2019-12-09 0:48 ` Al Viro
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=20191203051945.9440-2-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=arnd@arndb.de \
--cc=hirofumi@mail.parknet.co.jp \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).