diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2014-07-22 10:37:42 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2014-07-22 10:37:42 -0400 |
commit | a800bad36619ce47ac0222004635448e6c91ff72 (patch) | |
tree | 2fb2409ffa24b01792fece45f008fb24edb35fb1 /fs/fuse | |
parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) |
fuse: s_time_gran fix
Default s_time_gran is 1, don't overwrite that if userspace didn't
explicitly specify one.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: <stable@vger.kernel.org> # v3.15+
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 8474028d7848..5ca874f2415b 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -907,9 +907,6 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) | |||
907 | fc->writeback_cache = 1; | 907 | fc->writeback_cache = 1; |
908 | if (arg->time_gran && arg->time_gran <= 1000000000) | 908 | if (arg->time_gran && arg->time_gran <= 1000000000) |
909 | fc->sb->s_time_gran = arg->time_gran; | 909 | fc->sb->s_time_gran = arg->time_gran; |
910 | else | ||
911 | fc->sb->s_time_gran = 1000000000; | ||
912 | |||
913 | } else { | 910 | } else { |
914 | ra_pages = fc->max_read / PAGE_CACHE_SIZE; | 911 | ra_pages = fc->max_read / PAGE_CACHE_SIZE; |
915 | fc->no_lock = 1; | 912 | fc->no_lock = 1; |