fuse: req state use flags

[deliverable/linux.git] / fs / fuse / fuse_i.h

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 3fd65f613515fa2927ab71e699e811fb2ca7c5e8..8eaf3b0de033792ef5db0d159ba5bff4251bd47a 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -241,14 +241,6 @@ struct fuse_args {
 
 #define FUSE_ARGS(args) struct fuse_args args = {}
 
-/** The request state */
-enum fuse_req_state {
-       FUSE_REQ_PENDING = 0,
-       FUSE_REQ_IO,
-       FUSE_REQ_SENT,
-       FUSE_REQ_FINISHED
-};
-
 /** The request IO state (for asynchronous processing) */
 struct fuse_io_priv {
        int async;
@@ -274,6 +266,9 @@ struct fuse_io_priv {
  * FR_ABORTED:         the request was aborted
  * FR_INTERRUPTED:     the request has been interrupted
  * FR_LOCKED:          data is being copied to/from the request
+ * FR_PENDING:         request is not yet in userspace
+ * FR_SENT:            request is in userspace, waiting for an answer
+ * FR_FINISHED:                request is finished
  */
 enum fuse_req_flag {
        FR_ISREPLY,
@@ -283,6 +278,9 @@ enum fuse_req_flag {
        FR_ABORTED,
        FR_INTERRUPTED,
        FR_LOCKED,
+       FR_PENDING,
+       FR_SENT,
+       FR_FINISHED,
 };
 
 /**
@@ -309,9 +307,6 @@ struct fuse_req {
        /* Request flags, updated with test/set/clear_bit() */
        unsigned long flags;
 
-       /** State of the request */
-       enum fuse_req_state state;
-
        /** The request input */
        struct fuse_in in;