erofs: clean up erofs_iget()
PATCH 1/2 erofs: clean up erofs_iget()
Move inode hash function into inode.c and simplify erofs_iget().
--- fs/erofs/inode.c | 40 +++++++++++++++++++++------------------- fs/erofs/internal.h | 9 --------- 2 files changed, 21 insertions(+), 28 deletions(-)
fs/erofs/inode.c +21 -19
@@ -308,47 +308,49 @@ static int erofs_fill_inode(struct inode *inode) }/* -* erofs nid is 64bits, but i_ino is 'unsigned long', therefore -* we should do more for 32-bit platform to find the right inode. +* ino_t is 32-bits on 32-bit arch. We have to squash the 64-bit value down +* so that it will fit. */ -static int erofs_ilookup_test_actor (struct inode *inode,void *opaque) +static ino_t erofs_squash_ino (erofs_nid_t nid) { -const erofs_nid_t nid = *(erofs_nid_t *)opaque; +ino_t ino = (ino_t )nid; + +if (sizeof (ino_t) <sizeof (erofs_nid_t)) + ino ^= nid >> (sizeof (erofs_nid_t) -sizeof (ino_t)) *8 ; +return ino; +} -return EROFS_I (inode)->nid == nid; +static int erofs_iget5_eq (struct inode *inode,void *opaque) +{ +return EROFS_I (inode)->nid == *(erofs_nid_t *)opaque; } -static int erofs_iget_set_actor (struct inode *inode,void *opaque) +static int erofs_iget5_set (struct inode *inode,void *opaque) {const erofs_nid_t nid = *(erofs_nid_t *)opaque; - inode->i_ino =erofs_inode_hash (nid); + inode->i_ino =erofs_squash_ino (nid); +EROFS_I (inode)->nid = nid;return 0 ; }struct inode *erofs_iget (struct super_block *sb,erofs_nid_t nid) { -const unsigned long hashval =erofs_inode_hash (nid);struct inode *inode; - inode =iget5_locked (sb, hashval, erofs_ilookup_test_actor, - erofs_iget_set_actor, &nid); + inode =iget5_locked (sb,erofs_squash_ino (nid), erofs_iget5_eq, + erofs_iget5_set, &nid);if (!inode)return ERR_PTR (-ENOMEM );if (inode->i_state &I_NEW ) { -int err; -struct erofs_inode *vi =EROFS_I (inode); - - vi->nid = nid; +int err =erofs_fill_inode (inode); - err =erofs_fill_inode (inode); -if (!err) { -unlock_new_inode (inode); - }else { +if (err) {iget_failed (inode); - inode =ERR_PTR (err); +return ERR_PTR (err); } +unlock_new_inode (inode); }return inode; }
fs/erofs/internal.h +0 -9
@@ -480,15 +480,6 @@ int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map, int flags);/* inode.c */ -static inline unsigned long erofs_inode_hash (erofs_nid_t nid) -{ -#if BITS_PER_LONG ==32 -return (nid >>32 ) ^ (nid &0xffffffff ); -#else -return nid; -#endif -} -extern const struct inode_operations erofs_generic_iops;extern const struct inode_operations erofs_symlink_iops;extern const struct inode_operations erofs_fast_symlink_iops;
Signature · 1 line
2.24.4
PATCH 2/2 erofs: remove linux/buffer_head.h dependency
EROFS actually never uses buffer heads, therefore just get rid of BH_xxx definitions and linux/buffer_head.h inclusive.
--- fs/erofs/internal.h | 20 ++++++-------------- fs/erofs/super.c | 1 - 2 files changed, 6 insertions(+), 15 deletions(-)
fs/erofs/internal.h +6 -14
@@ -12,7 +12,6 @@#include <linux/mm.h> #include <linux/pagemap.h> #include <linux/bio.h> -#include <linux/buffer_head.h> #include <linux/magic.h> #include <linux/slab.h> #include <linux/vmalloc.h>
@@ -388,25 +387,18 @@ extern struct file_system_type erofs_fs_type;extern const struct address_space_operations erofs_raw_access_aops;extern const struct address_space_operations z_erofs_aops; -enum { - BH_Encoded = BH_PrivateStart, - BH_FullMapped, - BH_Fragment, - BH_Partialref, -}; -/* Has a disk mapping */ -#define EROFS_MAP_MAPPED (1 << BH_Mapped) +#define EROFS_MAP_MAPPED 0x0001/* Located in metadata (could be copied from bd_inode) */ -#define EROFS_MAP_META (1 << BH_Meta) +#define EROFS_MAP_META 0x0002/* The extent is encoded */ -#define EROFS_MAP_ENCODED (1 << BH_Encoded) +#define EROFS_MAP_ENCODED 0x0004/* The length of extent is full */ -#define EROFS_MAP_FULL_MAPPED (1 << BH_FullMapped) +#define EROFS_MAP_FULL_MAPPED 0x0008/* Located in the special packed inode */ -#define EROFS_MAP_FRAGMENT (1 << BH_Fragment) +#define EROFS_MAP_FRAGMENT 0x0010/* The extent refers to partial decompressed data */ -#define EROFS_MAP_PARTIAL_REF (1 << BH_Partialref) +#define EROFS_MAP_PARTIAL_REF 0x0020struct erofs_map_blocks {struct erofs_buf buf;
fs/erofs/super.c +0 -1
@@ -5,7 +5,6 @@* Copyright (C) 2021, Alibaba Cloud */ #include <linux/module.h> -#include <linux/buffer_head.h> #include <linux/statfs.h> #include <linux/parser.h> #include <linux/seq_file.h>
Signature · 1 line
2.24.4
Re: [PATCH 2/2] erofs: remove linux/buffer_head.h dependency
Quoted 4 lines · On Fri, 13 Jan 2023 14:52:26 +0800 Gao Xiang <[email protected]>…
EROFS actually never uses buffer heads, therefore just get rid of
BH_xxxdefinitions andlinux/buffer_head.hinclusive.Signed-off-by Gao Xiang <[email protected]>
Re: [PATCH 2/2] erofs: remove linux/buffer_head.h dependency
In reply to Gao XiangQuoted 4 lines · Gao Xiang
EROFS actually never uses buffer heads, therefore just get rid of
BH_xxxdefinitions andlinux/buffer_head.hinclusive.Signed-off-by Gao Xiang <[email protected]>
Signature · 2 lines
Thanks, Jingbo
Quoted 3 lines · On Fri, 13 Jan 2023 14:52:25 +0800 Gao Xiang <[email protected]>…
Move inode hash function into
inode.cand simplifyerofs_iget().Signed-off-by Gao Xiang <[email protected]>
Quoted 19 lines · Gao Xiang
Move inode hash function into
inode.cand simplifyerofs_iget().Signed-off-by Gao Xiang <[email protected]>--- fs/erofs/inode.c | 40 +++++++++++++++++++++------------------- fs/erofs/internal.h | 9 --------- 2 files changed, 21 insertions(+), 28 deletions(-)fs/erofs/inode.c +1
-2@@ -308,47 +308,49 @@ static int erofs_fill_inode(struct inode *inode) }/* -* erofs nid is 64bits, but i_ino is 'unsigned long', therefore -* we should do more for 32-bit platform to find the right inode. +* ino_t is 32-bits on 32-bit arch. We have to squash the 64-bit value down
fs/erofs/inode.c static int erofs_fill_inode(struct inode *inode) · line 319
Quoted 10 lines
fs/erofs/inode.c +6
-2+* so that it will fit. */ -static int erofs_ilookup_test_actor (struct inode *inode,void *opaque) +static ino_t erofs_squash_ino (erofs_nid_t nid) { -const erofs_nid_t nid = *(erofs_nid_t *)opaque; +ino_t ino = (ino_t )nid; + +if (sizeof (ino_t) <sizeof (erofs_nid_t)) + ino ^= nid >> (sizeof (erofs_nid_t) -sizeof (ino_t)) *8 ;
Shouldn't we do:
ino ^= nid >> sizeof(ino_t) * 8
?
Signature · 2 lines
Thanks, Jingbo
Quoted 35 lines · Jingbo Xu
Quoted 19 lines · Gao Xiang
Move inode hash function into
inode.cand simplifyerofs_iget().Signed-off-by Gao Xiang <[email protected]>--- fs/erofs/inode.c | 40 +++++++++++++++++++++------------------- fs/erofs/internal.h | 9 --------- 2 files changed, 21 insertions(+), 28 deletions(-)fs/erofs/inode.c +1
-2@@ -308,47 +308,49 @@ static int erofs_fill_inode(struct inode *inode) }/* -* erofs nid is 64bits, but i_ino is 'unsigned long', therefore -* we should do more for 32-bit platform to find the right inode. +* ino_t is 32-bits on 32-bit arch. We have to squash the 64-bit value down fs/erofs/inode.c static int erofs_fill_inode(struct inode *inode) · line 319
Quoted 10 lines
fs/erofs/inode.c +6
-2+* so that it will fit. */ -static int erofs_ilookup_test_actor (struct inode *inode,void *opaque) +static ino_t erofs_squash_ino (erofs_nid_t nid) { -const erofs_nid_t nid = *(erofs_nid_t *)opaque; +ino_t ino = (ino_t )nid; + +if (sizeof (ino_t) <sizeof (erofs_nid_t)) + ino ^= nid >> (sizeof (erofs_nid_t) -sizeof (ino_t)) *8 ;Shouldn't we do:
Quoted 1 line
ino ^= nid >> sizeof(ino_t) * 8
Actually I copied it from fuse, for 64-bit erofs_nid_t it has no difference though. I will also update it as your suggestion in v2.
Thanks,
Gao Xiang
Quoted 3 lines
?
Quoted 3 lines · Gao Xiang
Move inode hash function into
inode.cand simplifyerofs_iget().Signed-off-by Gao Xiang <[email protected]>
Since the v2 triggers the compiling error, this v1 is also acceptable for me.
Quoted 98 lines
--- fs/erofs/inode.c | 40 +++++++++++++++++++++------------------- fs/erofs/internal.h | 9 --------- 2 files changed, 21 insertions(+), 28 deletions(-)fs/erofs/inode.c +21
-19@@ -308,47 +308,49 @@ static int erofs_fill_inode(struct inode *inode) }/* -* erofs nid is 64bits, but i_ino is 'unsigned long', therefore -* we should do more for 32-bit platform to find the right inode. +* ino_t is 32-bits on 32-bit arch. We have to squash the 64-bit value down +* so that it will fit. */ -static int erofs_ilookup_test_actor (struct inode *inode,void *opaque) +static ino_t erofs_squash_ino (erofs_nid_t nid) { -const erofs_nid_t nid = *(erofs_nid_t *)opaque; +ino_t ino = (ino_t )nid; + +if (sizeof (ino_t) <sizeof (erofs_nid_t)) + ino ^= nid >> (sizeof (erofs_nid_t) -sizeof (ino_t)) *8 ; +return ino; +} -return EROFS_I (inode)->nid == nid; +static int erofs_iget5_eq (struct inode *inode,void *opaque) +{ +return EROFS_I (inode)->nid == *(erofs_nid_t *)opaque; } -static int erofs_iget_set_actor (struct inode *inode,void *opaque) +static int erofs_iget5_set (struct inode *inode,void *opaque) {const erofs_nid_t nid = *(erofs_nid_t *)opaque; - inode->i_ino =erofs_inode_hash (nid); + inode->i_ino =erofs_squash_ino (nid); +EROFS_I (inode)->nid = nid;return 0 ; }struct inode *erofs_iget (struct super_block *sb,erofs_nid_t nid) { -const unsigned long hashval =erofs_inode_hash (nid);struct inode *inode; - inode =iget5_locked (sb, hashval, erofs_ilookup_test_actor, - erofs_iget_set_actor, &nid); + inode =iget5_locked (sb,erofs_squash_ino (nid), erofs_iget5_eq, + erofs_iget5_set, &nid);if (!inode)return ERR_PTR (-ENOMEM );if (inode->i_state &I_NEW ) { -int err; -struct erofs_inode *vi =EROFS_I (inode); - - vi->nid = nid; +int err =erofs_fill_inode (inode); - err =erofs_fill_inode (inode); -if (!err) { -unlock_new_inode (inode); - }else { +if (err) {iget_failed (inode); - inode =ERR_PTR (err); +return ERR_PTR (err); } +unlock_new_inode (inode); }return inode; }fs/erofs/internal.h +0
-9@@ -480,15 +480,6 @@ int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map, int flags);/* inode.c */ -static inline unsigned long erofs_inode_hash (erofs_nid_t nid) -{ -#if BITS_PER_LONG ==32 -return (nid >>32 ) ^ (nid &0xffffffff ); -#else -return nid; -#endif -} -extern const struct inode_operations erofs_generic_iops;extern const struct inode_operations erofs_symlink_iops;extern const struct inode_operations erofs_fast_symlink_iops;
Signature · 2 lines
Thanks, Jingbo
Quoted 3 lines · Gao Xiang
Move inode hash function into
inode.cand simplifyerofs_iget().Signed-off-by Gao Xiang <[email protected]>
Thanks,