| From 126b9d4365b110c157bc4cbc32540dfa66c9c85a Mon Sep 17 00:00:00 2001 |
| From: Miklos Szeredi <mszeredi@suse.cz> |
| Date: Mon, 7 Jul 2014 15:28:50 +0200 |
| Subject: fuse: timeout comparison fix |
| |
| From: Miklos Szeredi <mszeredi@suse.cz> |
| |
| commit 126b9d4365b110c157bc4cbc32540dfa66c9c85a upstream. |
| |
| As suggested by checkpatch.pl, use time_before64() instead of direct |
| comparison of jiffies64 values. |
| |
| Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/fuse/dir.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/fs/fuse/dir.c |
| +++ b/fs/fuse/dir.c |
| @@ -198,7 +198,7 @@ static int fuse_dentry_revalidate(struct |
| 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; |
| @@ -925,7 +925,7 @@ int fuse_update_attributes(struct inode |
| 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 { |
| @@ -1111,7 +1111,7 @@ static int fuse_permission(struct inode |
| ((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); |
