diff options
author | Jan Kara <jack@suse.cz> | 2009-11-30 16:17:41 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2009-12-10 09:02:53 -0500 |
commit | 30673930051e5203d0b826b8b8f2454cab453b94 (patch) | |
tree | 5778b88101593c21881d37bdd0f4d85ffb77a6ca | |
parent | 92e128884bf04fb155413a78f45be1d73dff75a7 (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.h | 4 | ||||
-rw-r--r-- | include/linux/quota.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/ocfs2/quota.h b/fs/ocfs2/quota.h index e5df9d170b0c..123bc520a2c0 100644 --- a/fs/ocfs2/quota.h +++ b/fs/ocfs2/quota.h | |||
@@ -17,10 +17,6 @@ | |||
17 | 17 | ||
18 | #include "ocfs2.h" | 18 | #include "ocfs2.h" |
19 | 19 | ||
20 | /* Common stuff */ | ||
21 | /* id number of quota format */ | ||
22 | #define QFMT_OCFS2 3 | ||
23 | |||
24 | /* | 20 | /* |
25 | * In-memory structures | 21 | * In-memory structures |
26 | */ | 22 | */ |
diff --git a/include/linux/quota.h b/include/linux/quota.h index f63c9d6ba784..7db3a005483f 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h | |||
@@ -73,6 +73,7 @@ | |||
73 | /* Quota format type IDs */ | 73 | /* Quota format type IDs */ |
74 | #define QFMT_VFS_OLD 1 | 74 | #define QFMT_VFS_OLD 1 |
75 | #define QFMT_VFS_V0 2 | 75 | #define QFMT_VFS_V0 2 |
76 | #define QFMT_OCFS2 3 | ||
76 | 77 | ||
77 | /* Size of block in which space limits are passed through the quota | 78 | /* Size of block in which space limits are passed through the quota |
78 | * interface */ | 79 | * interface */ |