sync with 2.6.12-rc2-mm1

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 1dd0d10983ddd468128ad1be480c4f31bea36313..373f36dd821fdc3db893421d53932142bdfeee15 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -307,6 +307,9 @@ struct fuse_conn {
        /** The next unique request id */
        int reqctr;
 
+       /** Connection failed (version mismatch) */
+       unsigned conn_error : 1;
+
        /** Is fsync not implemented by fs? */
        unsigned no_fsync : 1;
 
@@ -328,9 +331,6 @@ struct fuse_conn {
        /** Is removexattr not implemented by fs? */
        unsigned no_removexattr : 1;
 
-       /** Connection failed (version mismatch) */
-       unsigned conn_error : 1;
-
 #ifdef KERNEL_2_6
        /** Backing dev info */
        struct backing_dev_info bdi;