]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
fuse: s_time_gran fix
authorMiklos Szeredi <mszeredi@suse.cz>
Tue, 22 Jul 2014 14:37:42 +0000 (16:37 +0200)
committerMiklos Szeredi <mszeredi@suse.cz>
Tue, 22 Jul 2014 14:37:42 +0000 (16:37 +0200)
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+
fs/fuse/inode.c

index 8474028d7848064912b34df229b893c39f6144e9..5ca874f2415b692d9701baca395f2d93f1f6eeed 100644 (file)
@@ -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;