From 30673930051e5203d0b826b8b8f2454cab453b94 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Mon, 30 Nov 2009 22:17:41 +0100
Subject: 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 e5df9d1..123bc52 100644
--- 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 f63c9d6..7db3a00 100644
--- 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 */
-- 
cgit v0.10.2