[GFS2] Fix up merge of Linus' kernel into GFS2

[linux-drm-fsl-dcu.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4e93bf92508679289f8b6d81c1ffde192ae078e9..48f982100f5a2047031496a7a602f44c4512f30c 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -92,9 +92,10 @@ extern int dir_notify_enable;
 #define FS_REQUIRES_DEV 1 
 #define FS_BINARY_MOUNTDATA 2
 #define FS_REVAL_DOT   16384   /* Check the paths ".", ".." for staleness */
-#define FS_ODD_RENAME  32768   /* Temporary stuff; will go away as soon
-                                 * as nfs_rename() will be cleaned up
-                                 */
+#define FS_RENAME_DOES_D_MOVE  32768   /* FS will handle d_move()
+                                        * during rename() internally.
+                                        */
+
 /*
  * These are the fs-independent mount-flags: up to 32 flags are supported
  */