Skip to contentSkip to conversation

fs-efs-remove-unneeded-debug-prints.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Jun 11

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: fs: efs: remove unneeded debug prints
has been removed from the -mm tree. Its filename was
fs-efs-remove-unneeded-debug-prints.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Maxwell Doose <[email protected]>
Subject: fs: efs: remove unneeded debug prints
Date: Thu, 4 Jun 2026 22:52:51 -0500

The current code uses debug prints conditionally compiled with #ifdef DEBUG. However, that code, when compiled, causes compiler errors due to incompatible formatters and undefined variables, notably:

fs/efs/file.c: In function `efs_get_block':
fs/efs/file.c:26:35: error: block' undeclared (first use in this function); did you mean iblock'?
26 | __func__, block, inode->i_blocks, inode->i_size);
| ^~~~~

and:

fs/efs/file.c: In function `efs_bmap':
./include/linux/kern_levels.h:5:25: error: format %ld' expects argument of type long int', but argument 4 has type blkcnt_t' {aka long long unsigned int'} [-Werror=format=]

   5 | #define KERN_SOH        "\001"          /* ASCII Start Of Header */
     |                         ^~~~~~

which also extends to the other formatters. As this part of the code has been dead for just about 14 years now, it has not been modernized to stay compatible with the most recent gcc compilers. Fix these issues by removing the debug prints.

Fixes f403d1dbac6d ("fs/efs: add pr_fmt / use __func__")
Cc Fabian Frederick <[email protected]>
Cc Christian Brauner <[email protected]>

---

 fs/efs/file.c |   21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)
fs/efs/file.c renamed from fs/efs/file.c~fs-efs-remove-unneeded-debug-prints +3 -18
@@ -18,16 +18,9 @@ int efs_get_block(struct inode *inode, s
 
 	if (create)
 		return error;
-	if (iblock >= inode->i_blocks) {
-#ifdef DEBUG
-		/*
-		 * i have no idea why this happens as often as it does
-		 */
-		pr_warn("%s(): block %d >= %ld (filesize %ld)\n",
-			__func__, block, inode->i_blocks, inode->i_size);
-#endif
+	if (iblock >= inode->i_blocks)
 		return 0;
-	}
+
 	phys = efs_map_block(inode, iblock);
 	if (phys)
 		map_bh(bh_result, inode->i_sb, phys);
@@ -42,16 +35,8 @@ int efs_bmap(struct inode *inode, efs_bl
 	}
 
 	/* are we about to read past the end of a file ? */
-	if (!(block < inode->i_blocks)) {
-#ifdef DEBUG
-		/*
-		 * i have no idea why this happens as often as it does
-		 */
-		pr_warn("%s(): block %d >= %ld (filesize %ld)\n",
-			__func__, block, inode->i_blocks, inode->i_size);
-#endif
+	if (!(block < inode->i_blocks))
 		return 0;
-	}
 
 	return efs_map_block(inode, block);
 }

_

Patches currently in -mm which might be from [email protected] are