diff --git a/[refs] b/[refs]
index ef42f4e3b8c6..a124ed3538d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca785ec66b991e9ca74dd9840fc014487ad095e1
+refs/heads/master: cf770c137122b78470a67ebd5498947869a09197
diff --git a/trunk/fs/quota_v1.c b/trunk/fs/quota_v1.c
index 3e078eee5644..b4af1c69ad16 100644
--- a/trunk/fs/quota_v1.c
+++ b/trunk/fs/quota_v1.c
@@ -3,13 +3,14 @@
 #include <linux/quota.h>
 #include <linux/quotaops.h>
 #include <linux/dqblk_v1.h>
-#include <linux/quotaio_v1.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
 #include <asm/byteorder.h>
 
+#include "quotaio_v1.h"
+
 MODULE_AUTHOR("Jan Kara");
 MODULE_DESCRIPTION("Old quota format support");
 MODULE_LICENSE("GPL");
diff --git a/trunk/fs/quota_v2.c b/trunk/fs/quota_v2.c
index 51c4717f7c6a..a21d1a7c356a 100644
--- a/trunk/fs/quota_v2.c
+++ b/trunk/fs/quota_v2.c
@@ -6,7 +6,6 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/dqblk_v2.h>
-#include <linux/quotaio_v2.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -15,6 +14,8 @@
 
 #include <asm/byteorder.h>
 
+#include "quotaio_v2.h"
+
 MODULE_AUTHOR("Jan Kara");
 MODULE_DESCRIPTION("Quota format v2 support");
 MODULE_LICENSE("GPL");
@@ -129,8 +130,8 @@ static void mem2diskdqb(struct v2_disk_dqblk *d, struct mem_dqblk *m, qid_t id)
 	d->dqb_isoftlimit = cpu_to_le32(m->dqb_isoftlimit);
 	d->dqb_curinodes = cpu_to_le32(m->dqb_curinodes);
 	d->dqb_itime = cpu_to_le64(m->dqb_itime);
-	d->dqb_bhardlimit = cpu_to_le32(v2_qbtos(m->dqb_bhardlimit));
-	d->dqb_bsoftlimit = cpu_to_le32(v2_qbtos(m->dqb_bsoftlimit));
+	d->dqb_bhardlimit = cpu_to_le32(v2_stoqb(m->dqb_bhardlimit));
+	d->dqb_bsoftlimit = cpu_to_le32(v2_stoqb(m->dqb_bsoftlimit));
 	d->dqb_curspace = cpu_to_le64(m->dqb_curspace);
 	d->dqb_btime = cpu_to_le64(m->dqb_btime);
 	d->dqb_id = cpu_to_le32(id);
diff --git a/trunk/include/linux/quotaio_v1.h b/trunk/fs/quotaio_v1.h
similarity index 100%
rename from trunk/include/linux/quotaio_v1.h
rename to trunk/fs/quotaio_v1.h
diff --git a/trunk/include/linux/quotaio_v2.h b/trunk/fs/quotaio_v2.h
similarity index 100%
rename from trunk/include/linux/quotaio_v2.h
rename to trunk/fs/quotaio_v2.h
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 95ac82340c3b..900a787cbae9 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -134,8 +134,6 @@ header-y += posix_types.h
 header-y += ppdev.h
 header-y += prctl.h
 header-y += qnxtypes.h
-header-y += quotaio_v1.h
-header-y += quotaio_v2.h
 header-y += radeonfb.h
 header-y += raw.h
 header-y += resource.h