summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2014-07-22 16:37:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-31 12:44:08 -0700
commit67268040cb50767fe61330d4382eb4bac78b7d61 (patch)
treea71e20ab8dc7d9ea678ab8a414c299e64bab15de
parented74143eaf102ba8aa0f88094219f87c0af7c56b (diff)
downloadlwn-67268040cb50767fe61330d4382eb4bac78b7d61.tar.gz
lwn-67268040cb50767fe61330d4382eb4bac78b7d61.zip
fuse: s_time_gran fix
commit a800bad36619ce47ac0222004635448e6c91ff72 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 e2cd799e4d21..26328c162c94 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;