From 170fd6a43e774871d96556b4f4320464981f4fc6 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Thu, 26 Apr 2012 10:56:36 +0200
Subject: [PATCH] --- yaml --- r: 310479 b: refs/heads/master c:
 519c6040ce04474bc893774f866fd8d907b20429 h: refs/heads/master i:   310477:
 3543d1d678769589cfc563530f25f44b7a3300f0   310475:
 f6a82b987e5cfcf55ba3745d9e8566a1f7bd314c   310471:
 e7d1e91c7e11f43792d301a3adf57f0b92d74e79   310463:
 877115062b7fb24397a700f50c172ab26043f982 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/fuse/file.c   | 7 +++++++
 trunk/fs/fuse/fuse_i.h | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9ab15022eb3a..c6450affb345 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05ba1f0823004e947748523782e9c2f07f3bff0d
+refs/heads/master: 519c6040ce04474bc893774f866fd8d907b20429
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
index e3fee88831d4..bbfd571b37e1 100644
--- a/trunk/fs/fuse/file.c
+++ b/trunk/fs/fuse/file.c
@@ -2185,6 +2185,9 @@ long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
 	};
 	int err;
 
+	if (fc->no_fallocate)
+		return -EOPNOTSUPP;
+
 	req = fuse_get_req(fc);
 	if (IS_ERR(req))
 		return PTR_ERR(req);
@@ -2196,6 +2199,10 @@ long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
 	req->in.args[0].value = &inarg;
 	fuse_request_send(fc, req);
 	err = req->out.h.error;
+	if (err == -ENOSYS) {
+		fc->no_fallocate = 1;
+		err = -EOPNOTSUPP;
+	}
 	fuse_put_request(fc, req);
 
 	return err;
diff --git a/trunk/fs/fuse/fuse_i.h b/trunk/fs/fuse/fuse_i.h
index 572cefc78012..f38fb795f03c 100644
--- a/trunk/fs/fuse/fuse_i.h
+++ b/trunk/fs/fuse/fuse_i.h
@@ -478,6 +478,9 @@ struct fuse_conn {
 	/** Are BSD file locking primitives not implemented by fs? */
 	unsigned no_flock:1;
 
+	/** Is fallocate not implemented by fs? */
+	unsigned no_fallocate:1;
+
 	/** The number of requests waiting for completion */
 	atomic_t num_waiting;