From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 28 Mar 2024 17:51:24 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.47.1-rc1~72
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d656357241b50b2bd54c7099b6f2b987b58150df;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

d656357241b50b2bd54c7099b6f2b987b58150df
diff --cc misc/tune2fs.c
index 78b5834,c32d93c..f0af3ca
--- a/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;
  		}