fs: efs: Remove unneeded debug prints
PATCH v2 1/1 fs: efs: Remove unneeded debug prints
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.
---
v2:
- Change commit to remove debug prints instead of updating them to pr_debug() per Andrew's suggestion.
- Change commit message to include compiler errors noted by gcc per Andrew's suggestion.
fs/efs/file.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)
fs/efs/file.c +3 -18
@@ -18,16 +18,9 @@ int efs_get_block(struct inode *inode, sector_t iblock,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_block_t block) { }/* 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); }
Signature · 1 line
2.54.0
Quoted 1 line · Maxwell Doose
fs: efs: Remove unneeded debug prints
Applied to the vfs-7.3.misc branch of the vfs/vfs.git tree. Patches in the vfs-7.3.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-7.3.misc
[1/1] fs: efs: Remove unneeded debug prints
https://git.kernel.org/vfs/vfs/c/1fb3f646c9d1
Quoted 5 lines · Christian Brauner
Quoted 1 line · Maxwell Doose
fs: efs: Remove unneeded debug prints
Applied to the vfs-7.3.misc branch of the vfs/vfs.git tree. Patches in the vfs-7.3.misc branch should appear in linux-next soon.
Too late; Andrew already merged this as 89009392c80d
Plus, it'd be better to just delete the whole filesystem.
https://lore.kernel.org/linux-fsdevel/[email protected]/
(now has a slight conflict as this patch has been merged)