quota: Move definition of QFMT_OCFS2 to linux/quota.h

Move definition of this constant to linux/quota.h so that it
cannot clash with other format IDs.

CC: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/ocfs2/quota.h b/fs/ocfs2/quota.h
index e5df9d170b0cbd6cc8541f68fda5d34a1f62c7f5..123bc520a2c0378bd85f8a5a6fe8a30871ea3d32 100644 (file)
--- a/fs/ocfs2/quota.h
+++ b/fs/ocfs2/quota.h
@@ -17,10 +17,6 @@
 
 #include "ocfs2.h"
 
-/* Common stuff */
-/* id number of quota format */
-#define QFMT_OCFS2 3
-
 /*
  * In-memory structures
  */

diff --git a/include/linux/quota.h b/include/linux/quota.h
index f63c9d6ba7843dcb7a4983bf0d44870e534a9a4d..7db3a005483f1ea2f6b17312b962f7534490f8b7 100644 (file)
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -73,6 +73,7 @@
 /* Quota format type IDs */
 #define        QFMT_VFS_OLD 1
 #define        QFMT_VFS_V0 2
+#define QFMT_OCFS2 3
 
 /* Size of block in which space limits are passed through the quota
  * interface */