UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs/adfs: mostly divorse inode number from indirect disc address 

Avoid using the inode number as the indirect disc address, even though
these currently have the same value.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Russell King 2019-12-09 11:11:38 +00:00 committed by Al Viro
parent 08ead1b8b9
commit 25e5d4df3b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/adfs/adfs.h
View File

@ -32,6 +32,7 @@ static inline u16 adfs_filetype(u32 loadaddr)
struct adfs_inode_info { struct adfs_inode_info {
loff_t mmu_private; loff_t mmu_private;
__u32 parent_id; /* parent indirect disc address */ __u32 parent_id; /* parent indirect disc address */
__u32 indaddr; /* object indirect disc address */
__u32 loadaddr; /* RISC OS load address */ __u32 loadaddr; /* RISC OS load address */
__u32 execaddr; /* RISC OS exec address */ __u32 execaddr; /* RISC OS exec address */
unsigned int attr; /* RISC OS permissions */ unsigned int attr; /* RISC OS permissions */

4
fs/adfs/dir.c
View File

@ -158,7 +158,7 @@ static int adfs_dir_read_inode(struct super_block *sb, struct inode *inode,
{ {
int ret; int ret;
ret = adfs_dir_read(sb, inode->i_ino, inode->i_size, dir); ret = adfs_dir_read(sb, ADFS_I(inode)->indaddr, inode->i_size, dir);
if (ret) if (ret)
return ret; return ret;
@ -372,7 +372,7 @@ static int adfs_dir_lookup_byname(struct inode *inode, const struct qstr *qstr,
break; break;
} }
} }
obj->parent_id = inode->i_ino; obj->parent_id = ADFS_I(inode)->indaddr;
unlock_relse: unlock_relse:
up_read(&adfs_dir_rwsem); up_read(&adfs_dir_rwsem);

6
fs/adfs/inode.c
View File

@ -20,7 +20,8 @@ adfs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh,
if (block >= inode->i_blocks) if (block >= inode->i_blocks)
goto abort_toobig; goto abort_toobig;
block = __adfs_block_map(inode->i_sb, inode->i_ino, block); block = __adfs_block_map(inode->i_sb, ADFS_I(inode)->indaddr,
block);
if (block) if (block)
map_bh(bh, inode->i_sb, block); map_bh(bh, inode->i_sb, block);
return 0; return 0;
@ -259,6 +260,7 @@ adfs_iget(struct super_block *sb, struct object_info *obj)
* for cross-directory renames. * for cross-directory renames.
*/ */
ADFS_I(inode)->parent_id = obj->parent_id; ADFS_I(inode)->parent_id = obj->parent_id;
ADFS_I(inode)->indaddr = obj->indaddr;
ADFS_I(inode)->loadaddr = obj->loadaddr; ADFS_I(inode)->loadaddr = obj->loadaddr;
ADFS_I(inode)->execaddr = obj->execaddr; ADFS_I(inode)->execaddr = obj->execaddr;
ADFS_I(inode)->attr = obj->attr; ADFS_I(inode)->attr = obj->attr;
@ -353,7 +355,7 @@ int adfs_write_inode(struct inode *inode, struct writeback_control *wbc)
struct object_info obj; struct object_info obj;
int ret; int ret;
obj.indaddr = inode->i_ino; obj.indaddr = ADFS_I(inode)->indaddr;
obj.name_len = 0; obj.name_len = 0;
obj.parent_id = ADFS_I(inode)->parent_id; obj.parent_id = ADFS_I(inode)->parent_id;
obj.loadaddr = ADFS_I(inode)->loadaddr; obj.loadaddr = ADFS_I(inode)->loadaddr;