Merge branch 'maint' into next

diff --cc misc/tune2fs.c
index 78b58347f3fa5af6eaee9a0e7555802fa0fecd16,c32d93c895dd63103a3748e05759a080823117e8..f0af3cae83df24bf52418514820b4a7720b976c4
--- 1/misc/tune2fs.c
--- 2/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -3499,29 -3261,11 +3499,29 @@@ _("Warning: The journal is dirty. You m
                if (rc)
                        goto closefs;
        }
 +      if (orphan_file_blocks) {
 +              errcode_t err;
 +
 +              err = ext2fs_read_bitmaps(fs);
 +              if (err) {
 +                      com_err(program_name, err, "%s",
 +                              _("while loading bitmaps"));
 +                      rc = 1;
 +                      goto closefs;
 +              }
 +              err = ext2fs_create_orphan_file(fs, orphan_file_blocks);
 +              if (err) {
 +                      com_err(program_name, err, "%s",
 +                              _("while creating orphan file"));
 +                      rc = 1;
 +                      goto closefs;
 +              }
 +      }
  
        if (Q_flag) {
-               if (mount_flags & EXT2_MF_MOUNTED) {
+               if (mount_flags & (EXT2_MF_BUSY | EXT2_MF_MOUNTED)) {
                        fputs(_("The quota feature may only be changed when "
-                               "the filesystem is unmounted.\n"), stderr);
+                               "the filesystem is unmounted and not in use.\n"), stderr);
                        rc = 1;
                        goto closefs;
                }