[PATCH v8 4/5] fs: add timestamp_truncate_to_gran helper

From: Jeff Layton
Date: Fri Sep 22 2023 - 13:15:16 EST


In a future patch, we're going to need to truncate fine-grained
timestamps down to jiffies granularity. Add a new helper that allows
truncating down to an arbitrary granularity.

Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
---
fs/inode.c | 38 +++++++++++++++++++++++++++-----------
include/linux/fs.h | 1 +
2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/fs/inode.c b/fs/inode.c
index 293f9ba623d1..ae6baa5b17c5 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2521,6 +2521,29 @@ void inode_nohighmem(struct inode *inode)
}
EXPORT_SYMBOL(inode_nohighmem);

+/**
+ * timestamp_truncate_to_gran - Truncate timespec to a granularity
+ * @t: Timespec
+ * @gran: the specified granularity (in ns)
+ *
+ * Truncate a timespec to the specified granularity. Always rounds down.
+ * gran must not be 0 nor greater than a second (NSEC_PER_SEC, or 10^9 ns).
+ */
+struct timespec64 timestamp_truncate_to_gran(struct timespec64 t, unsigned int gran)
+{
+ /* Avoid division in the common cases 1 ns and 1 s. */
+ if (gran == 1)
+ ; /* nothing */
+ else if (gran == NSEC_PER_SEC)
+ t.tv_nsec = 0;
+ else if (gran > 1 && gran < NSEC_PER_SEC)
+ t.tv_nsec -= t.tv_nsec % gran;
+ else
+ WARN(1, "invalid file time granularity: %u", gran);
+ return t;
+}
+EXPORT_SYMBOL(timestamp_truncate_to_gran);
+
/**
* timestamp_truncate - Truncate timespec to a granularity
* @t: Timespec
@@ -2536,19 +2559,12 @@ struct timespec64 timestamp_truncate(struct timespec64 t, struct inode *inode)
unsigned int gran = sb->s_time_gran;

t.tv_sec = clamp(t.tv_sec, sb->s_time_min, sb->s_time_max);
- if (unlikely(t.tv_sec == sb->s_time_max || t.tv_sec == sb->s_time_min))
+ if (unlikely(t.tv_sec == sb->s_time_max || t.tv_sec == sb->s_time_min)) {
t.tv_nsec = 0;
+ return t;
+ }

- /* Avoid division in the common cases 1 ns and 1 s. */
- if (gran == 1)
- ; /* nothing */
- else if (gran == NSEC_PER_SEC)
- t.tv_nsec = 0;
- else if (gran > 1 && gran < NSEC_PER_SEC)
- t.tv_nsec -= t.tv_nsec % gran;
- else
- WARN(1, "invalid file time granularity: %u", gran);
- return t;
+ return timestamp_truncate_to_gran(t, gran);
}
EXPORT_SYMBOL(timestamp_truncate);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 91239a4c1a65..fa696322dae3 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -748,6 +748,7 @@ struct inode {
void *i_private; /* fs or device private pointer */
} __randomize_layout;

+struct timespec64 timestamp_truncate_to_gran(struct timespec64 t, unsigned int gran);
struct timespec64 timestamp_truncate(struct timespec64 t, struct inode *inode);

static inline unsigned int i_blocksize(const struct inode *node)

--
2.41.0