erofs-utils: don't create hardlinked directories
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 erofs-utils: don't create hardlinked directories
From: Gao Xiang <[email protected]>
From: Gao Xiang <[email protected]>
Fix an issue which behaves the same as the following mkisofs BZ due to bindmount:
https://bugzilla.redhat.com/show_bug.cgi?id=1749860
---
regression testcases will be uploaded to:
https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/log/?h=experimental-tests
for now (erofs-utils v1.3 will include testcases then.)
lib/inode.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
lib/inode.c +10 -3
@@ -823,9 +823,16 @@ struct erofs_inode *erofs_iget_from_path(const char *path, bool is_src)if (ret)return ERR_PTR (-errno); - inode =erofs_iget (st.st_ino); -if (inode) -return inode; +/* +* lookup in hash table first, if it already exists we have a +* hard-link, just return it. Also don't lookup for directories +* since hard-link directory isn't allowed. +*/ +if (!S_ISDIR (st.st_mode)) { + inode =erofs_iget (st.st_ino); +if (inode) +return inode; + }/* cannot find in the inode cache */ inode =erofs_new_inode ();
Signature · 1 line
2.24.0
PATCH 2/2 erofs-utils: fix cross-device sub-mounts
From: Gao Xiang <[email protected]>
From: Gao Xiang <[email protected]>
Use device ID and inode number to identify hardlinks rather than inode number only.
--- include/erofs/internal.h | 7 ++++++- lib/inode.c | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-)
include/erofs/internal.h +6 -1
@@ -112,7 +112,12 @@ EROFS_FEATURE_FUNCS(sb_chksum, compat, COMPAT_SB_CHKSUM)struct erofs_inode {struct list_head i_hash, i_subdirs, i_xattrs; -unsigned int flags; +union { +/* (erofsfuse) runtime flags */ +unsigned int flags; +/* (mkfs.erofs) device ID containing source file */ +u32 dev; + };unsigned int i_count;struct erofs_inode *i_parent;
lib/inode.c +10 -8
@@ -35,7 +35,7 @@ static unsigned char erofs_type_by_mode[S_IFMT >> S_SHIFT] = { [S_IFLNK >> S_SHIFT] = EROFS_FT_SYMLINK, }; -#define NR_INODE_HASHTABLE 64 +#define NR_INODE_HASHTABLE 16384struct list_head inode_hashtable[NR_INODE_HASHTABLE ];
@@ -54,14 +54,14 @@ static struct erofs_inode *erofs_igrab(struct erofs_inode *inode) }/* get the inode from the (source) inode # */ -struct erofs_inode *erofs_iget (ino_t ino) +struct erofs_inode *erofs_iget (dev_t dev,ino_t ino) {struct list_head *head = - &inode_hashtable[ino %NR_INODE_HASHTABLE ]; + &inode_hashtable[(ino ^ dev) %NR_INODE_HASHTABLE ];struct erofs_inode *inode;list_for_each_entry (inode, head, i_hash) -if (inode->i_ino[1 ] == ino) +if (inode->i_ino[1 ] == ino && inode->dev == dev)return erofs_igrab (inode);return NULL ; }
@@ -764,6 +764,7 @@ int erofs_fill_inode(struct erofs_inode *inode,strncpy (inode->i_srcpath, path,sizeof (inode->i_srcpath) -1 ); inode->i_srcpath[sizeof (inode->i_srcpath) -1 ] ='\0' ; + inode->dev = st->st_dev; inode->i_ino[1 ] = st->st_ino;if (erofs_should_use_inode_extended (inode)) {
@@ -778,7 +779,8 @@ int erofs_fill_inode(struct erofs_inode *inode, }list_add (&inode->i_hash, - &inode_hashtable[st->st_ino %NR_INODE_HASHTABLE ]); + &inode_hashtable[(st->st_ino ^ st->st_dev) % +NR_INODE_HASHTABLE ]);return 0 ; }
@@ -824,12 +826,12 @@ struct erofs_inode *erofs_iget_from_path(const char *path, bool is_src)return ERR_PTR (-errno);/* -* lookup in hash table first, if it already exists we have a -* hard-link, just return it. Also don't lookup for directories +* lookup in hash table first, if it already exists we have +* a hard-link, just return it. Don't lookup for directories * since hard-link directory isn't allowed. */ if (!S_ISDIR (st.st_mode)) { - inode =erofs_iget (st.st_ino); + inode =erofs_iget (st.st_dev, st.st_ino);if (inode)return inode; }
Signature · 1 line
2.24.0
PATCH v2 2/2 erofs-utils: fix cross-device submounts
From: Gao Xiang <[email protected]>
Use device ID and inode number to identify hardlinks rather than inode number only.
---
changes since v1:
- fix improper inline comment update;
include/erofs/internal.h | 7 ++++++- lib/inode.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-)
include/erofs/internal.h +6 -1
@@ -112,7 +112,12 @@ EROFS_FEATURE_FUNCS(sb_chksum, compat, COMPAT_SB_CHKSUM)struct erofs_inode {struct list_head i_hash, i_subdirs, i_xattrs; -unsigned int flags; +union { +/* (erofsfuse) runtime flags */ +unsigned int flags; +/* (mkfs.erofs) device ID containing source file */ +u32 dev; + };unsigned int i_count;struct erofs_inode *i_parent;
lib/inode.c +8 -6
@@ -35,7 +35,7 @@ static unsigned char erofs_type_by_mode[S_IFMT >> S_SHIFT] = { [S_IFLNK >> S_SHIFT] = EROFS_FT_SYMLINK, }; -#define NR_INODE_HASHTABLE 64 +#define NR_INODE_HASHTABLE 16384struct list_head inode_hashtable[NR_INODE_HASHTABLE ];
@@ -54,14 +54,14 @@ static struct erofs_inode *erofs_igrab(struct erofs_inode *inode) }/* get the inode from the (source) inode # */ -struct erofs_inode *erofs_iget (ino_t ino) +struct erofs_inode *erofs_iget (dev_t dev,ino_t ino) {struct list_head *head = - &inode_hashtable[ino %NR_INODE_HASHTABLE ]; + &inode_hashtable[(ino ^ dev) %NR_INODE_HASHTABLE ];struct erofs_inode *inode;list_for_each_entry (inode, head, i_hash) -if (inode->i_ino[1 ] == ino) +if (inode->i_ino[1 ] == ino && inode->dev == dev)return erofs_igrab (inode);return NULL ; }
@@ -764,6 +764,7 @@ int erofs_fill_inode(struct erofs_inode *inode,strncpy (inode->i_srcpath, path,sizeof (inode->i_srcpath) -1 ); inode->i_srcpath[sizeof (inode->i_srcpath) -1 ] ='\0' ; + inode->dev = st->st_dev; inode->i_ino[1 ] = st->st_ino;if (erofs_should_use_inode_extended (inode)) {
@@ -778,7 +779,8 @@ int erofs_fill_inode(struct erofs_inode *inode, }list_add (&inode->i_hash, - &inode_hashtable[st->st_ino %NR_INODE_HASHTABLE ]); + &inode_hashtable[(st->st_ino ^ st->st_dev) % +NR_INODE_HASHTABLE ]);return 0 ; }
@@ -829,7 +831,7 @@ struct erofs_inode *erofs_iget_from_path(const char *path, bool is_src)* since hard-link directory isn't allowed. */ if (!S_ISDIR (st.st_mode)) { - inode =erofs_iget (st.st_ino); + inode =erofs_iget (st.st_dev, st.st_ino);if (inode)return inode; }
Signature · 1 line
2.24.0
Re: [PATCH v2 2/2] erofs-utils: fix cross-device submounts
Quoted 7 lines · Gao Xiang via Linux-erofs
From: Gao Xiang <[email protected]>
Use device ID and inode number to identify hardlinks rather than inode number only.
Fixes a17497f0844a ("erofs-utils: introduce inode operations")Signed-off-by Gao Xiang <[email protected]>
Quoted 8 lines
---
changes since v1:
- fix improper inline comment update;include/erofs/internal.h | 7 ++++++- lib/inode.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-)
It looks good
Thanks,
Quoted 10 lines · Gao Xiang via Linux-erofs
From: Gao Xiang <[email protected]>
From: Gao Xiang <[email protected]>
Fix an issue which behaves the same as the following mkisofs BZ due to bindmount:
https://bugzilla.redhat.com/show_bug.cgi?id=1749860Fixes a17497f0844a ("erofs-utils: introduce inode operations")Signed-off-by Gao Xiang <[email protected]>
Quoted 8 lines
---
regression testcases will be uploaded to:
https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/log/?h=experimental-tests
for now (erofs-utils v1.3 will include testcases then.)lib/inode.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
It looks good
Thanks,