[RESEND] fuse: convert last timespec use to timespec64

Commit Message

Arnd Bergmann July 13, 2018, 2:35 p.m. UTC

All of fuse uses 64-bit timestamps with the exception of the
fuse_change_attributes(), so let's convert this one as well.

Signed-off-by: Arnd Bergmann <[e-mail]>
---
I submitted this on June 20 but got no reply. Miklos, could
you pick this up for 4.19?
---
 fs/fuse/inode.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Miklos Szeredi July 17, 2018, 1:44 p.m. UTC | #1

On Fri, Jul 13, 2018 at 4:35 PM, Arnd Bergmann <[e-mail]> wrote:
> All of fuse uses 64-bit timestamps with the exception of the
> fuse_change_attributes(), so let's convert this one as well.
>
> Signed-off-by: Arnd Bergmann <[e-mail]>
> ---
> I submitted this on June 20 but got no reply. Miklos, could
> you pick this up for 4.19?

Applied, thanks.

Miklos

Patch

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 85b3954945af..f6f46bb5ef4b 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -209,7 +209,7 @@  void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
 	struct fuse_inode *fi = get_fuse_inode(inode);
 	bool is_wb = fc->writeback_cache;
 	loff_t oldsize;
-	struct timespec old_mtime;
+	struct timespec64 old_mtime;
 
 	spin_lock(&fc->lock);
 	if ((attr_version != 0 && fi->attr_version > attr_version) ||
@@ -218,7 +218,7 @@  void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
 		return;
 	}
 
-	old_mtime = timespec64_to_timespec(inode->i_mtime);
+	old_mtime = inode->i_mtime;
 	fuse_change_attributes_common(inode, attr, attr_valid);
 
 	oldsize = inode->i_size;
@@ -238,7 +238,7 @@  void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
 			truncate_pagecache(inode, attr->size);
 			inval = true;
 		} else if (fc->auto_inval_data) {
-			struct timespec new_mtime = {
+			struct timespec64 new_mtime = {
 				.tv_sec = attr->mtime,
 				.tv_nsec = attr->mtimensec,
 			};
@@ -247,7 +247,7 @@  void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
 			 * Auto inval mode also checks and invalidates if mtime
 			 * has changed.
 			 */
-			if (!timespec_equal(&old_mtime, &new_mtime))
+			if (!timespec64_equal(&old_mtime, &new_mtime))
 				inval = true;
 		}