aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2009-11-30 22:17:41 +0100
committerJan Kara <jack@suse.cz>2009-12-10 15:02:53 +0100
commit30673930051e5203d0b826b8b8f2454cab453b94 (patch)
tree5778b88101593c21881d37bdd0f4d85ffb77a6ca
parent92e128884bf04fb155413a78f45be1d73dff75a7 (diff)
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>
-rw-r--r--fs/ocfs2/quota.h4
-rw-r--r--include/linux/quota.h1
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/ocfs2/quota.h b/fs/ocfs2/quota.h
index e5df9d170b0..123bc520a2c 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 f63c9d6ba78..7db3a005483 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 */