Skip to contentSkip to conversation

Improve user experience with xfs_fsr

PATCH Superseded [email protected] 2 participants 5 messages Mar 17

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover Improve user experience with xfs_fsr

From: Carlos Maiolino <[email protected]>

This is the V2 of this series (my apologies for the delay), based on an user report via IRC in January.

V2 specific changes are detailed on each patch, but mostly patch 1 was changed. Patch 2 only the description

Carlos Maiolino (2):
fsr: package function should check for negative errors
fsr: always print error messages from xfrog_defragrange()

 fsr/xfs_fsr.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
Signature · 1 line
2.53.0
#1 lore raw

PATCH v2 1/2 fsr: package function should check for negative errors

From: Carlos Maiolino <[email protected]>

xfrog_defragrange as most other functions from libfrog return a negative error value, while xfs_fsr's packfile(), expects a positive error value.

Whenever xfrog_defragrange fails, the switch case always falls into the default clausule, making the error message pointless.

Update packfile() to switch between negative errors.

---
V2:
Change packfile() to check for negative error values instead of changing the return sign from xfrog_defragrange().

 fsr/xfs_fsr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fsr/xfs_fsr.c +3 -3
index 8845ff172fcb..aa2a10839314 100644
@@ -1463,17 +1463,17 @@ packfile(
 	switch (error) {
 		case 0:
 			break;
-	case ENOTSUP:
+	case -ENOTSUP:
 		if (vflag || dflag)
 			fsrprintf(_("%s: file type not supported\n"), fname);
 		break;
-	case EFAULT:
+	case -EFAULT:
 		/* The file has changed since we started the copy */
 		if (vflag || dflag)
 			fsrprintf(_("%s: file modified defrag aborted\n"),
 					fname);
 		break;
-	case EBUSY:
+	case -EBUSY:
 		/* Timestamp has changed or mmap'ed file */
 		if (vflag || dflag)
 			fsrprintf(_("%s: file busy\n"), fname);
Signature · 1 line
2.53.0
#3 lore raw

PATCH v2 2/2 fsr: always print error messages from xfrog_defragrange()

In reply to [email protected]

From: Carlos Maiolino <[email protected]>

Error messages from xfrog_defragrange() are only printed when verbose/debug flags are used.

We had reports from users complaining it's hard to find out the error messages lost in the middle of dozens of other informational messages.

Change packfile() behavior to print errors independently of verbose or debug flags.

---
V2: Update commit description

 fsr/xfs_fsr.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
fsr/xfs_fsr.c +3 -7
index aa2a10839314..151f8ba42380 100644
@@ -1464,19 +1464,15 @@ packfile(
 		case 0:
 			break;
 	case -ENOTSUP:
-		if (vflag || dflag)
-			fsrprintf(_("%s: file type not supported\n"), fname);
+		fsrprintf(_("%s: file type not supported\n"), fname);
 		break;
 	case -EFAULT:
 		/* The file has changed since we started the copy */
-		if (vflag || dflag)
-			fsrprintf(_("%s: file modified defrag aborted\n"),
-					fname);
+		fsrprintf(_("%s: file modified defrag aborted\n"), fname);
 		break;
 	case -EBUSY:
 		/* Timestamp has changed or mmap'ed file */
-		if (vflag || dflag)
-			fsrprintf(_("%s: file busy\n"), fname);
+		fsrprintf(_("%s: file busy\n"), fname);
 		break;
 	default:
 		fsrprintf(_("XFS_IOC_SWAPEXT failed: %s: %s\n"),
Signature · 1 line
2.53.0
#2 lore raw

Re: [PATCH v2 1/2] fsr: package function should check for negative errors

In reply to [email protected]
Quoted 25 lines · On Tue, Mar 17, 2026 at 05:07:39PM +0100, [email protected] wrote:

From: Carlos Maiolino <[email protected]>

xfrog_defragrange as most other functions from libfrog return a negative error value, while xfs_fsr's packfile(), expects a positive error value.

Whenever xfrog_defragrange fails, the switch case always falls into the default clausule, making the error message pointless.

Update packfile() to switch between negative errors.

---
V2:
Change packfile() to check for negative error values instead of changing the return sign from xfrog_defragrange().

 fsr/xfs_fsr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fsr/xfs_fsr.c +0 -0
index 8845ff172fcb..aa2a10839314 100644

fsr/xfs_fsr.c packfile( · line 1466

Quoted 5 lines
fsr/xfs_fsr.c +1 -1
@@ -1463,17 +1463,17 @@ packfile(
 	switch (error) {
 		case 0:
 			break;
-	case ENOTSUP:
+	case -ENOTSUP:

I would have just made the call site invert the sign:

	error = -xfrog_defragrange(...);

because you wouldn't have to change the case statements, and...

Quoted 5 lines
fsr/xfs_fsr.c +1 -1
 		if (vflag || dflag)
 			fsrprintf(_("%s: file type not supported\n"), fname);
 		break;
-	case EFAULT:
+	case -EFAULT:

fsr/xfs_fsr.c packfile( · line 1479

Quoted 10 lines
fsr/xfs_fsr.c +1 -1
 		/* The file has changed since we started the copy */
 		if (vflag || dflag)
 			fsrprintf(_("%s: file modified defrag aborted\n"),
 					fname);
 		break;
-	case EBUSY:
+	case -EBUSY:
 		/* Timestamp has changed or mmap'ed file */
 		if (vflag || dflag)
 			fsrprintf(_("%s: file busy\n"), fname);

...the default case below is still broken due to the strerror() call:

	default:
		fsrprintf(_("XFS_IOC_SWAPEXT failed: %s: %s\n"),
			  fname, strerror(error));

https://lore.kernel.org/linux-xfs/20260120172039.GO15551@frogsfrogsfrogs/

--D

Reviewed-by on v2 2/2
#4 lore raw

Re: [PATCH v2 2/2] fsr: always print error messages from xfrog_defragrange()

In reply to [email protected]
Quoted 5 lines · On Tue, Mar 17, 2026 at 05:07:40PM +0100, [email protected] wrote:

From: Carlos Maiolino <[email protected]>

Error messages from xfrog_defragrange() are only printed when verbose/debug flags are used.

Quoted 7 lines

We had reports from users complaining it's hard to find out the error messages lost in the middle of dozens of other informational messages.

Change packfile() behavior to print errors independently of verbose or debug flags.

Still

https://lore.kernel.org/linux-xfs/20260120172355.GP15551@frogsfrogsfrogs/

--D

Quoted 37 lines

---
V2: Update commit description

 fsr/xfs_fsr.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
fsr/xfs_fsr.c +3 -7
index aa2a10839314..151f8ba42380 100644
@@ -1464,19 +1464,15 @@ packfile(
 		case 0:
 			break;
 	case -ENOTSUP:
-		if (vflag || dflag)
-			fsrprintf(_("%s: file type not supported\n"), fname);
+		fsrprintf(_("%s: file type not supported\n"), fname);
 		break;
 	case -EFAULT:
 		/* The file has changed since we started the copy */
-		if (vflag || dflag)
-			fsrprintf(_("%s: file modified defrag aborted\n"),
-					fname);
+		fsrprintf(_("%s: file modified defrag aborted\n"), fname);
 		break;
 	case -EBUSY:
 		/* Timestamp has changed or mmap'ed file */
-		if (vflag || dflag)
-			fsrprintf(_("%s: file busy\n"), fname);
+		fsrprintf(_("%s: file busy\n"), fname);
 		break;
 	default:
 		fsrprintf(_("XFS_IOC_SWAPEXT failed: %s: %s\n"),
Signature · 1 line
2.53.0