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

Commit 126b9d43 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: timeout comparison fix 



As suggested by checkpatch.pl, use time_before64() instead of direct
comparison of jiffies64 values.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Cc: <stable@vger.kernel.org>
parent 1860e379

fs/fuse/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) 
	inode = ACCESS_ONCE(entry->d_inode);

	if (inode && is_bad_inode(inode))

		goto invalid;

	else if (fuse_dentry_time(entry) < get_jiffies_64()) {

	else if (time_before64(fuse_dentry_time(entry), get_jiffies_64())) {

		int err;

		struct fuse_entry_out outarg;

		struct fuse_req *req;
@@ -985,7 +985,7 @@ int fuse_update_attributes(struct inode *inode, struct kstat *stat, 
	int err;

	bool r;



	if (fi->i_time < get_jiffies_64()) {

	if (time_before64(fi->i_time, get_jiffies_64())) {

		r = true;

		err = fuse_do_getattr(inode, stat, file);

	} else {
@@ -1171,7 +1171,7 @@ static int fuse_permission(struct inode *inode, int mask) 
	    ((mask & MAY_EXEC) && S_ISREG(inode->i_mode))) {

		struct fuse_inode *fi = get_fuse_inode(inode);



		if (fi->i_time < get_jiffies_64()) {

		if (time_before64(fi->i_time, get_jiffies_64())) {

			refreshed = true;



			err = fuse_perm_getattr(inode, mask);