diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-06-04 14:49:57 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-06-26 20:14:14 -0400 |
| commit | 5ed70bb47767d1f57a5e85e585a327917ded0373 (patch) | |
| tree | 26f11c56c91e796486d08ef92dd4e53c29882612 /fs/adfs/map.c | |
| parent | ceb3b10613eba86ddf043345338e32673a27f87a (diff) | |
| download | linux-5ed70bb47767d1f57a5e85e585a327917ded0373.tar.bz2 | |
fs/adfs: clean up indirect disc addresses and fragment IDs
We use a variety of different names for the indirect disc address of
the current object, use a variety of different types, and print it in
a variety of different ways. Bring some consistency to this by naming
it "indaddr", use u32 or __u32 as the type since it fits in 32-bits,
and always print it with %06x (with no leading hex prefix.)
When printing it was a directory identifer, use "dir %06x" otherwise
use "object %06x".
Do the same for fragment IDs and the parent indirect disc addresses.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/adfs/map.c')
| -rw-r--r-- | fs/adfs/map.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/adfs/map.c b/fs/adfs/map.c index 5f2d9d775305..e8f70f7c384e 100644 --- a/fs/adfs/map.c +++ b/fs/adfs/map.c @@ -66,9 +66,8 @@ static DEFINE_RWLOCK(adfs_map_lock); * output of: * gcc -D__KERNEL__ -O2 -I../../include -o - -S map.c */ -static int -lookup_zone(const struct adfs_discmap *dm, const unsigned int idlen, - const unsigned int frag_id, unsigned int *offset) +static int lookup_zone(const struct adfs_discmap *dm, const unsigned int idlen, + const u32 frag_id, unsigned int *offset) { const unsigned int mapsize = dm->dm_endbit; const u32 idmask = (1 << idlen) - 1; @@ -187,9 +186,8 @@ error: return 0; } -static int -scan_map(struct adfs_sb_info *asb, unsigned int zone, - const unsigned int frag_id, unsigned int mapoff) +static int scan_map(struct adfs_sb_info *asb, unsigned int zone, + const u32 frag_id, unsigned int mapoff) { const unsigned int idlen = asb->s_idlen; struct adfs_discmap *dm, *dm_end; @@ -243,9 +241,7 @@ adfs_map_free(struct super_block *sb) return signed_asl(total, asb->s_map2blk); } -int -adfs_map_lookup(struct super_block *sb, unsigned int frag_id, - unsigned int offset) +int adfs_map_lookup(struct super_block *sb, u32 frag_id, unsigned int offset) { struct adfs_sb_info *asb = ADFS_SB(sb); unsigned int zone, mapoff; |