diff --git a/[refs] b/[refs] index dd020f042a7a..016493c49205 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92e128884bf04fb155413a78f45be1d73dff75a7 +refs/heads/master: 30673930051e5203d0b826b8b8f2454cab453b94 diff --git a/trunk/fs/ocfs2/quota.h b/trunk/fs/ocfs2/quota.h index e5df9d170b0c..123bc520a2c0 100644 --- a/trunk/fs/ocfs2/quota.h +++ b/trunk/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/trunk/include/linux/quota.h b/trunk/include/linux/quota.h index f63c9d6ba784..7db3a005483f 100644 --- a/trunk/include/linux/quota.h +++ b/trunk/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 */