mirror of
https://github.com/torvalds/linux
synced 2026-07-22 10:10:47 +09:00
89009392c8
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.
Link: https://lore.kernel.org/20260605035251.89305-2-m32285159@gmail.com
Fixes: f403d1dbac ("fs/efs: add pr_fmt / use __func__")
Signed-off-by: Maxwell Doose <m32285159@gmail.com>
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Christian Brauner <brauner@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
43 lines
792 B
C
43 lines
792 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* file.c
|
|
*
|
|
* Copyright (c) 1999 Al Smith
|
|
*
|
|
* Portions derived from work (c) 1995,1996 Christian Vogelgsang.
|
|
*/
|
|
|
|
#include <linux/buffer_head.h>
|
|
#include "efs.h"
|
|
|
|
int efs_get_block(struct inode *inode, sector_t iblock,
|
|
struct buffer_head *bh_result, int create)
|
|
{
|
|
int error = -EROFS;
|
|
long phys;
|
|
|
|
if (create)
|
|
return error;
|
|
if (iblock >= inode->i_blocks)
|
|
return 0;
|
|
|
|
phys = efs_map_block(inode, iblock);
|
|
if (phys)
|
|
map_bh(bh_result, inode->i_sb, phys);
|
|
return 0;
|
|
}
|
|
|
|
int efs_bmap(struct inode *inode, efs_block_t block) {
|
|
|
|
if (block < 0) {
|
|
pr_warn("%s(): block < 0\n", __func__);
|
|
return 0;
|
|
}
|
|
|
|
/* are we about to read past the end of a file ? */
|
|
if (!(block < inode->i_blocks))
|
|
return 0;
|
|
|
|
return efs_map_block(inode, block);
|
|
}
|