From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 22 Jul 2014 14:37:42 +0000 (+0200)
Subject: fuse: s_time_gran fix
X-Git-Tag: v3.15.8~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67268040cb50767fe61330d4382eb4bac78b7d61;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index e2cd799e4d217..26328c162c94a 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;