diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-06-04 15:49:57 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-06-27 02:14:14 +0200 |
| commit | 5ed70bb47767d1f57a5e85e585a327917ded0373 (patch) | |
| tree | 26f11c56c91e796486d08ef92dd4e53c29882612 /fs/adfs/inode.c | |
| parent | fs/adfs: clean up error message printing (diff) | |
| download | linux-5ed70bb47767d1f57a5e85e585a327917ded0373.tar.xz linux-5ed70bb47767d1f57a5e85e585a327917ded0373.zip | |
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/inode.c')
| -rw-r--r-- | fs/adfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c index 66621e96f9af..5f5af660b02e 100644 --- a/fs/adfs/inode.c +++ b/fs/adfs/inode.c @@ -250,7 +250,7 @@ adfs_iget(struct super_block *sb, struct object_info *obj) inode->i_uid = ADFS_SB(sb)->s_uid; inode->i_gid = ADFS_SB(sb)->s_gid; - inode->i_ino = obj->file_id; + inode->i_ino = obj->indaddr; inode->i_size = obj->size; set_nlink(inode, 2); inode->i_blocks = (inode->i_size + sb->s_blocksize - 1) >> @@ -358,7 +358,7 @@ int adfs_write_inode(struct inode *inode, struct writeback_control *wbc) struct object_info obj; int ret; - obj.file_id = inode->i_ino; + obj.indaddr = inode->i_ino; obj.name_len = 0; obj.parent_id = ADFS_I(inode)->parent_id; obj.loadaddr = ADFS_I(inode)->loadaddr; |