Merge branch 'master' into 83xx

[linux-2.6] / fs / xfs / linux-2.6 / xfs_vfs.h

diff --git a/fs/xfs/linux-2.6/xfs_vfs.h b/fs/xfs/linux-2.6/xfs_vfs.h
index 91fc2c4b3353f1f4ea96ed51de25ade3f4304f76..e2c2ce98ab5bed792ebd9ee6d6ba8093dbbdcb6f 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_vfs.h
+++ b/fs/xfs/linux-2.6/xfs_vfs.h
@@ -79,7 +79,7 @@ typedef enum {
 #define VFS_RDONLY             0x0001  /* read-only vfs */
 #define VFS_GRPID              0x0002  /* group-ID assigned from directory */
 #define VFS_DMI                        0x0004  /* filesystem has the DMI enabled */
-#define VFS_UMOUNT             0x0008  /* unmount in progress */
+/* ---- VFS_UMOUNT ----                0x0008  -- unneeded, fixed via kthread APIs */
 #define VFS_32BITINODES                0x0010  /* do not use inums above 32 bits */
 #define VFS_END                        0x0010  /* max flag */
 
@@ -91,7 +91,7 @@ typedef enum {
 #define SYNC_FSDATA            0x0020  /* flush fs data (e.g. superblocks) */
 #define SYNC_REFCACHE          0x0040  /* prune some of the nfs ref cache */
 #define SYNC_REMOUNT           0x0080  /* remount readonly, no dummy LRs */
-#define SYNC_QUIESCE           0x0100  /* quiesce fileystem for a snapshot */
+#define SYNC_IOWAIT            0x0100  /* wait for all I/O to complete */
 
 #define SHUTDOWN_META_IO_ERROR 0x0001  /* write attempt to metadata failed */
 #define SHUTDOWN_LOG_IO_ERROR  0x0002  /* write attempt to the log failed */