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

Commit a64ba10f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Miklos Szeredi
Browse files

fuse: convert last timespec use to timespec64 



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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 46fb504a

fs/fuse/inode.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr, 
	struct fuse_inode *fi = get_fuse_inode(inode);

	struct fuse_inode *fi = get_fuse_inode(inode);

	bool is_wb = fc->writeback_cache;

	bool is_wb = fc->writeback_cache;

	loff_t oldsize;

	loff_t oldsize;

	struct timespec old_mtime;

	struct timespec64 old_mtime;





	spin_lock(&fc->lock);

	spin_lock(&fc->lock);

	if ((attr_version != 0 && fi->attr_version > attr_version) ||

	if ((attr_version != 0 && fi->attr_version > attr_version) ||
@@ -217,7 +217,7 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr, 
		return;

		return;

	}

	}





	old_mtime = timespec64_to_timespec(inode->i_mtime);

	old_mtime = inode->i_mtime;

	fuse_change_attributes_common(inode, attr, attr_valid);

	fuse_change_attributes_common(inode, attr, attr_valid);





	oldsize = inode->i_size;

	oldsize = inode->i_size;
@@ -237,7 +237,7 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr, 
			truncate_pagecache(inode, attr->size);

			truncate_pagecache(inode, attr->size);

			inval = true;

			inval = true;

		} else if (fc->auto_inval_data) {

		} else if (fc->auto_inval_data) {

			struct timespec new_mtime = {

			struct timespec64 new_mtime = {

				.tv_sec = attr->mtime,

				.tv_sec = attr->mtime,

				.tv_nsec = attr->mtimensec,

				.tv_nsec = attr->mtimensec,

			};

			};
@@ -246,7 +246,7 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr, 
			 * Auto inval mode also checks and invalidates if mtime

			 * Auto inval mode also checks and invalidates if mtime

			 * has changed.

			 * has changed.

			 */

			 */

			if (!timespec_equal(&old_mtime, &new_mtime))

			if (!timespec64_equal(&old_mtime, &new_mtime))

				inval = true;

				inval = true;

		}

		}