summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2014-07-22 16:37:42 +0200
committerMiklos Szeredi <mszeredi@suse.cz>2014-07-22 16:37:42 +0200
commita800bad36619ce47ac0222004635448e6c91ff72 (patch)
tree2fb2409ffa24b01792fece45f008fb24edb35fb1 /fs
parent9a3c4145af32125c5ee39c0272662b47307a8323 (diff)
downloadop-kernel-dev-a800bad36619ce47ac0222004635448e6c91ff72.zip
op-kernel-dev-a800bad36619ce47ac0222004635448e6c91ff72.tar.gz
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')
-rw-r--r--fs/fuse/inode.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 8474028..5ca874f 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)
fc->writeback_cache = 1;
if (arg->time_gran && arg->time_gran <= 1000000000)
fc->sb->s_time_gran = arg->time_gran;
- else
- fc->sb->s_time_gran = 1000000000;
-
} else {
ra_pages = fc->max_read / PAGE_CACHE_SIZE;
fc->no_lock = 1;
OpenPOWER on IntegriCloud