pull kernel module fixes from mainline

1 files changed, 8 insertions, 0 deletions

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index f9803b4..3ea9a57 100644
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -368,6 +368,9 @@ struct fuse_conn {
 	/** waitq for blocked connection */
 	wait_queue_head_t blocked_waitq;
 
+	/** waitq for reserved requests */
+	wait_queue_head_t reserved_req_waitq;
+
 	/** The next unique request id */
 	u64 reqctr;
 
@@ -639,3 +642,8 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc);
  * Is file type valid?
  */
 int fuse_valid_type(int m);
+
+/**
+ * Is task allowed to perform filesystem operation?
+ */
+int fuse_allow_task(struct fuse_conn *fc, struct task_struct *task);