Merge branch 'maint' into next

Conflicts:
	debugfs/Makefile.in
	debugfs/debug_cmds.ct
	debugfs/debugfs.c
	debugfs/debugfs.h
	e2fsck/Makefile.in
	misc/Makefile.in
	misc/mke2fs.c

diff --cc debugfs/Makefile.in
index 5097749ab9af69079ea20e80c19e87f6eafc4d35,3dd06f03f1398fa20da9edcdcab6a4c6ce7fa0ad..0f235959af4f2d6d99bfd3000c85e33515ba2b57
--- 1/debugfs/Makefile.in
--- 2/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@@ -18,26 -18,27 +18,28 @@@ MK_CMDS=   _SS_DIR_OVERRIDE=../lib/ss ../
  
  DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
        lsdel.o dump.o set_fields.o logdump.o htree.o unused.o e2freefrag.o \
-       filefrag.o extent_cmds.o extent_inode.o zap.o create_inode.o xattrs.o
 -      filefrag.o extent_cmds.o extent_inode.o zap.o quota.o
++      filefrag.o extent_cmds.o extent_inode.o zap.o create_inode.o \
++      quota.o xattrs.o
  
  RO_DEBUG_OBJS= ro_debug_cmds.o ro_debugfs.o util.o ncheck.o icheck.o ls.o \
        lsdel.o logdump.o htree.o e2freefrag.o filefrag.o extent_cmds.o \
-       extent_inode.o xattrs.o
 -      extent_inode.o quota.o
++      extent_inode.o quota.o xattrs.o
  
  SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \
        $(srcdir)/ncheck.c $(srcdir)/icheck.c $(srcdir)/lsdel.c \
        $(srcdir)/dump.c $(srcdir)/set_fields.c ${srcdir}/logdump.c \
        $(srcdir)/htree.c $(srcdir)/unused.c ${srcdir}/../misc/e2freefrag.c \
        $(srcdir)/filefrag.c $(srcdir)/extent_inode.c $(srcdir)/zap.c \
-       $(srcdir)/../misc/create_inode.c $(srcdir)/xattrs.c
 -      $(srcdir)/quota.c
++      $(srcdir)/../misc/create_inode.c $(srcdir)/xattrs.c $(srcdir)/quota.c
  
- LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
+ LIBS= $(LIBQUOTA) $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
        $(LIBUUID) $(SYSLIBS)
- DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) \
+ DEPLIBS= $(DEPLIBQUOTA) $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) \
        $(DEPLIBBLKID) $(DEPLIBUUID)
  
- STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBSS) $(STATIC_LIBCOM_ERR) \
-       $(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(STATIC_LIBE2P) $(SYSLIBS)
+ STATIC_LIBS= $(STATIC_LIBQUOTA) $(STATIC_LIBEXT2FS) $(STATIC_LIBSS) \
+       $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
+       $(STATIC_LIBE2P) $(SYSLIBS)
  STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBSS) \
                $(DEPSTATIC_LIBCOM_ERR) $(DEPSTATIC_LIBUUID) \
                $(DEPSTATIC_LIBE2P)
@@@ -147,8 -142,9 +149,11 @@@ debugfs.o: $(srcdir)/debugfs.c $(top_bu
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
-  $(srcdir)/../misc/nls-enable.h $(top_srcdir)/version.h $(srcdir)/jfs_user.h \
++ $(srcdir)/../misc/create_inode.h \
++ $(srcdir)/../misc/nls-enable.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
+  $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/jfs_user.h \
   $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
   $(top_srcdir)/lib/ext2fs/kernel-list.h
  util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \
@@@ -159,8 -155,8 +164,10 @@@
   $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
   $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/../misc/nls-enable.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
++ $(srcdir)/../misc/nls-enable.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
  ls.o: $(srcdir)/ls.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
   $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@@ -168,8 -164,8 +175,10 @@@
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/../misc/nls-enable.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
++ $(srcdir)/../misc/nls-enable.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
  ncheck.o: $(srcdir)/ncheck.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
   $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@@ -177,8 -173,8 +186,10 @@@
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/../misc/nls-enable.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
++ $(srcdir)/../misc/nls-enable.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
  icheck.o: $(srcdir)/icheck.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
   $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@@ -186,8 -182,8 +197,10 @@@
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/../misc/nls-enable.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
++ $(srcdir)/../misc/nls-enable.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
  lsdel.o: $(srcdir)/lsdel.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
   $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@@ -195,8 -191,8 +208,10 @@@
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/../misc/nls-enable.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
++ $(srcdir)/../misc/nls-enable.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
  dump.o: $(srcdir)/dump.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
   $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@@ -204,8 -200,8 +219,10 @@@
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/../misc/nls-enable.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
++ $(srcdir)/../misc/nls-enable.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
  set_fields.o: $(srcdir)/set_fields.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
   $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@@ -213,8 -209,9 +230,11 @@@
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/../misc/nls-enable.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
++ $(srcdir)/../misc/nls-enable.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
+  $(top_srcdir)/lib/e2p/e2p.h
  logdump.o: $(srcdir)/logdump.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
   $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@@ -222,10 -219,10 +242,14 @@@
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(top_srcdir)/lib/ext2fs/kernel-list.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
 + $(srcdir)/../misc/nls-enable.h $(srcdir)/jfs_user.h \
 + $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
++ $(top_srcdir)/lib/ext2fs/kernel-list.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
+  $(srcdir)/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
+  $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h
  htree.o: $(srcdir)/htree.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
   $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@@ -233,64 -230,58 +257,120 @@@
   $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
   $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
 + $(srcdir)/../misc/nls-enable.h
 +unused.o: $(srcdir)/unused.c $(top_builddir)/lib/config.h \
 + $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
 + $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
 + $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
 + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
 + $(srcdir)/../misc/nls-enable.h
 +e2freefrag.o: $(srcdir)/../misc/e2freefrag.c $(top_builddir)/lib/config.h \
 + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
 + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
 + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 + $(srcdir)/../misc/e2freefrag.h
 +filefrag.o: $(srcdir)/filefrag.c $(top_builddir)/lib/config.h \
 + $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
 + $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
 + $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
 + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
 + $(srcdir)/../misc/nls-enable.h
 +extent_inode.o: $(srcdir)/extent_inode.c $(top_builddir)/lib/config.h \
 + $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
 + $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
 + $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
 + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
 + $(srcdir)/../misc/nls-enable.h
 +zap.o: $(srcdir)/zap.c $(top_builddir)/lib/config.h \
 + $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
 + $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
 + $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
 + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
 + $(srcdir)/../misc/nls-enable.h
 +create_inode.o: $(srcdir)/../misc/create_inode.c \
 + $(srcdir)/../misc/create_inode.h $(top_srcdir)/lib/et/com_err.h \
 + $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
 + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
 + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
 + $(top_builddir)/lib/ext2fs/ext2_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 + $(srcdir)/../misc/nls-enable.h
 +xattrs.o: $(srcdir)/xattrs.c $(srcdir)/debugfs.h \
 + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
 + $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
 + $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
 + $(top_builddir)/lib/ext2fs/ext2_err.h \
 + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 + $(srcdir)/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
++ $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \
++ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
+  $(top_srcdir)/lib/e2p/e2p.h
+ unused.o: $(srcdir)/unused.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
+  $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
+ e2freefrag.o: $(srcdir)/../misc/e2freefrag.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+  $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+  $(srcdir)/../misc/e2freefrag.h
+ filefrag.o: $(srcdir)/filefrag.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
+  $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
+ extent_inode.o: $(srcdir)/extent_inode.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
+  $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
+ zap.o: $(srcdir)/zap.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
+  $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
+ quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
+  $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h

diff --cc debugfs/debug_cmds.ct
index 666032bf045d154e80a727d4169a576fbae3a4ef,6a18df67c83f92d3700d4496eed09e4bc671ea7a..814fd529f545a372e5001f4693ae495c5dce4860
--- 1/debugfs/debug_cmds.ct
--- 2/debugfs/debug_cmds.ct
+++ b/debugfs/debug_cmds.ct
@@@ -190,17 -190,11 +190,23 @@@ request do_zap_block, "Zap block: fill 
  request do_block_dump, "Dump contents of a block",
        block_dump, bd;
  
 +request do_list_xattr, "List extended attributes of an inode",
 +      ea_list;
 +
 +request do_get_xattr, "Get an extended attribute of an inode",
 +      ea_get;
 +
 +request do_set_xattr, "Set an extended attribute of an inode",
 +      ea_set;
 +
 +request do_rm_xattr, "Remove an extended attribute of an inode",
 +      ea_rm;
 +
+ request do_list_quota, "List quota",
+       list_quota, lq;
+ 
+ request do_get_quota, "Get quota",
+       get_quota, gq;
+ 
  end;
  

diff --cc debugfs/debugfs.c
index 72ab04060ccfffe7e7f2e322cf9a6997bb8643e9,326f41e8f5cd932b656f4e7bad0086419274068b..23a7ca39285dcab55d0731a60a7aca814360a315
--- 1/debugfs/debugfs.c
--- 2/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@@ -43,8 -55,9 +43,9 @@@ ss_request_table *extra_cmds
  const char *debug_prog_name;
  int sci_idx;
  
- ext2_filsys    current_fs;
- ext2_ino_t     root, cwd;
 -ext2_filsys   current_fs = NULL;
++ext2_filsys   current_fs;
+ quota_ctx_t   current_qctx;
+ ext2_ino_t    root, cwd;
  
  static void open_filesystem(char *device, int open_flags, blk64_t superblock,
                            blk64_t blocksize, int catastrophic,

diff --cc debugfs/debugfs.h
index 0164ca5d41d16ef10e05a85accc47b163a28334b,9b67f69c043fed9005f1291f56085d1b2492d742..df51aa06f9a9f4aa9d2cdee2ec0cba716fe1be08
--- 1/debugfs/debugfs.h
--- 2/debugfs/debugfs.h
+++ b/debugfs/debugfs.h
@@@ -5,7 -5,7 +5,8 @@@
  #include "ss/ss.h"
  #include "ext2fs/ext2_fs.h"
  #include "ext2fs/ext2fs.h"
 +#include "../misc/create_inode.h"
+ #include "quota/quotaio.h"
  
  #ifdef __STDC__
  #define NOARGS void

diff --cc e2fsck/Makefile.in
index 5a6883a6380fe8b26e756b6430767215ad851836,4b10f6fdd8dcabdddf265829186ca83c6bf5346e..9134957993732f870fdc690cc67ed38f30bef46d
--- 1/e2fsck/Makefile.in
--- 2/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@@ -281,10 -297,20 +281,10 @@@ e2fsck.o: $(srcdir)/e2fsck.c $(top_buil
   $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
   $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-  $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \
 - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \
 - $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
 - $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/problem.h
 -crc32.o: $(srcdir)/crc32.c $(top_builddir)/lib/config.h \
 - $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \
 - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
 - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
 - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
 - $(top_builddir)/lib/ext2fs/ext2_err.h \
 - $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \
 - $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
 - $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/crc32defs.h crc32table.h
 -gen_crc32table.o: $(srcdir)/gen_crc32table.c $(srcdir)/crc32defs.h
++ $(srcdir)/profile.h prof_err.h \
 + $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
 + $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
 + $(srcdir)/problem.h
  dict.o: $(srcdir)/dict.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/dict.h
  super.o: $(srcdir)/super.c $(top_builddir)/lib/config.h \

diff --cc e2fsck/e2fsck.h
Simple merge

diff --cc lib/ext2fs/Makefile.in
index 97fd066b3a5f7ae56dbc3b14e4a72102f2f22d18,c4a832981512e8740f0a9e451351d6f113acd4ff..ba2b2c4e3c847cab7b2264ac9070666cab67a1ae
--- 1/lib/ext2fs/Makefile.in
--- 2/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@@ -667,7 -656,7 +667,7 @@@ expanddir.o: $(srcdir)/expanddir.c $(to
   $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
   $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
   $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-- $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h
++ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/ext2fsP.h
  ext_attr.o: $(srcdir)/ext_attr.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
   $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2_ext_attr.h \
@@@ -834,7 -809,7 +834,7 @@@ mkdir.o: $(srcdir)/mkdir.c $(top_buildd
   $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
   $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
   $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-- $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h
++ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/ext2fsP.h
  mkjournal.o: $(srcdir)/mkjournal.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
   $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/e2p/e2p.h \
@@@ -884,7 -859,7 +884,7 @@@ punch.o: $(srcdir)/punch.c $(top_buildd
   $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
   $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
   $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-- $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h
++ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/ext2fsP.h
  qcow2.o: $(srcdir)/qcow2.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2fs.h \
   $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2_fs.h \

diff --cc lib/quota/Makefile.in
Simple merge

diff --cc misc/Makefile.in
index 7bd9b5f3a3c20e161003c6979312ccfdc5fce3ae,8d3318beec04f42eb5ae0902dde8ad2013e1d2bb..94fac2261cb229514a8e47afe5b9688f36c38805
--- 1/misc/Makefile.in
--- 2/misc/Makefile.in
+++ b/misc/Makefile.in
@@@ -646,12 -643,11 +645,12 @@@ mke2fs.o: $(srcdir)/mke2fs.c $(top_buil
   $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
   $(top_builddir)/lib/ext2fs/ext2_err.h \
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
 - $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
   $(srcdir)/util.h profile.h prof_err.h $(top_srcdir)/version.h \
-  $(top_srcdir)/lib/quota/mkquota.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
 - $(srcdir)/nls-enable.h $(top_srcdir)/lib/quota/quotaio.h \
 - $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
 - $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/mke2fs.h
++ $(top_srcdir)/lib/ext2fs/ext2fs.h \
 + $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
 + $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
 + $(srcdir)/mke2fs.h $(srcdir)/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
 + $(srcdir)/nls-enable.h
  mk_hugefiles.o: $(srcdir)/mk_hugefiles.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
   $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fsP.h \

diff --cc misc/ext4.5.in
Simple merge

diff --cc misc/mke2fs.c
index 565389db9001fd488c865631596dbe9e06c60da1,eb9846a758c29e6a893b1ab202043d14c535c850..522df1baa6edf9241522d0e2838d6f40362f565d
--- 1/misc/mke2fs.c
--- 2/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -55,9 -61,9 +55,9 @@@ extern int optind
  #include "profile.h"
  #include "prof_err.h"
  #include "../version.h"
- #include "quota/mkquota.h"
 -#include "nls-enable.h"
+ #include "quota/quotaio.h"
  #include "mke2fs.h"
 +#include "create_inode.h"
  
  #define STRIDE_LENGTH 8
  
@@@ -2239,15 -2163,7 +2240,8 @@@ profile_error
                                  "See https://ext4.wiki.kernel.org/"
                                  "index.php/Bigalloc for more information\n\n"));
  
-       if (!quiet &&
-           (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA))
-               fprintf(stderr, "%s", _("\nWarning: the quota feature is "
-                                 "still under development\n"
-                                 "See https://ext4.wiki.kernel.org/"
-                                 "index.php/Quota for more information\n\n"));
- 
 -      /* Since sparse_super is the default, we would only have a problem
 +      /*
 +       * Since sparse_super is the default, we would only have a problem
         * here if it was explicitly disabled.
         */
        if ((fs_param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) &&

diff --cc misc/tune2fs.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge