erofs-utils: fsck: add support for extracting hard links
PATCH 1/1 erofs-utils: fsck: add support for extracting hard links
From: Yue Hu <[email protected]>
Currently hard links can't be extracted correctly, let's support it now.
--- fsck/main.c | 152 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 124 insertions(+), 28 deletions(-)
fsck/main.c +124 -28
@@ -49,6 +49,16 @@ static struct option long_options[] = { {0, 0, 0, 0}, }; +#define NR_HARDLINK_HASHTABLE 16384 + +struct hardlink_entry { +struct list_head list; +erofs_nid_t nid; +char *path; +}; + +static struct list_head hardlink_hashtable[NR_HARDLINK_HASHTABLE ]; +static void print_available_decompressors (FILE *f,const char *delim) {unsigned int i =0 ;
@@ -550,6 +560,64 @@ static inline int erofs_extract_dir(struct erofs_inode *inode)return 0 ; } +static char *erofsfsck_hardlink_find (erofs_nid_t nid) +{ +struct list_head *head = + &hardlink_hashtable[nid %NR_HARDLINK_HASHTABLE ]; +struct hardlink_entry *entry; + +if (list_empty (head)) +return NULL ; + +list_for_each_entry (entry, head, list) +if (entry->nid == nid) +return entry->path; +return NULL ; +} + +static int erofsfsck_hardlink_insert (erofs_nid_t nid,const char *path) +{ +struct hardlink_entry *entry; + + entry =malloc (sizeof (*entry)); +if (!entry) +return -ENOMEM ; + + entry->nid = nid; + entry->path =strdup (path); +if (!entry->path) +return -ENOMEM ; + +list_add_tail (&entry->list, + &hardlink_hashtable[nid %NR_HARDLINK_HASHTABLE ]); +return 0 ; +} + +static void erofsfsck_hardlink_init (void ) +{ +unsigned int i; + +for (i =0 ; i <NR_HARDLINK_HASHTABLE ; ++i) +init_list_head (&hardlink_hashtable[i]); +} + +static void erofsfsck_hardlink_exit (void ) +{ +struct hardlink_entry *entry, *n; +struct list_head *head; +unsigned int i; + +for (i =0 ; i <NR_HARDLINK_HASHTABLE ; ++i) { + head = &hardlink_hashtable[i]; + +list_for_each_entry_safe (entry, n, head, list) { +if (entry->path) +free (entry->path); +free (entry); + } + } +} +static inline int erofs_extract_file (struct erofs_inode *inode) {bool tryagain = true;
@@ -719,6 +787,57 @@ static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx)return ret; } +static int erofsfsck_extract_inode (struct erofs_inode *inode) +{ +int ret; +char *oldpath; + +if (!fsckcfg.extract_path ||erofs_is_packed_inode (inode)) { +verify: +/* verify data chunk layout */ +return erofs_verify_inode_data (inode,-1 ); + } + + oldpath =erofsfsck_hardlink_find (inode->nid); +if (oldpath) { +if (link (oldpath, fsckcfg.extract_path) ==-1 ) { +erofs_err ("failed to extract hard link: %s (%s)" , + fsckcfg.extract_path,strerror (errno)); +return -errno; + } +return 0 ; + } + +switch (inode->i_mode &S_IFMT ) { +case S_IFDIR : + ret =erofs_extract_dir (inode); +break ; +case S_IFREG : + ret =erofs_extract_file (inode); +break ; +case S_IFLNK : + ret =erofs_extract_symlink (inode); +break ; +case S_IFCHR : +case S_IFBLK : +case S_IFIFO : +case S_IFSOCK : + ret =erofs_extract_special (inode); +break ; +default : +/* TODO */ + goto verify; + } +if (ret && ret != -ECANCELED ) +return ret; + +/* record nid and old path for hardlink */ +if (inode->i_nlink >1 && !S_ISDIR (inode->i_mode)) + ret =erofsfsck_hardlink_insert (inode->nid, + fsckcfg.extract_path); +return ret; +} +static int erofsfsck_check_inode (erofs_nid_t pnid,erofs_nid_t nid) {int ret;
@@ -740,34 +859,7 @@ static int erofsfsck_check_inode(erofs_nid_t pnid, erofs_nid_t nid)if (ret) goto out; -if (fsckcfg.extract_path) { -switch (inode.i_mode &S_IFMT ) { -case S_IFDIR : - ret =erofs_extract_dir (&inode); -break ; -case S_IFREG : -if (erofs_is_packed_inode (&inode)) - goto verify; - ret =erofs_extract_file (&inode); -break ; -case S_IFLNK : - ret =erofs_extract_symlink (&inode); -break ; -case S_IFCHR : -case S_IFBLK : -case S_IFIFO : -case S_IFSOCK : - ret =erofs_extract_special (&inode); -break ; -default : -/* TODO */ - goto verify; - } - }else { -verify: -/* verify data chunk layout */ - ret =erofs_verify_inode_data (&inode,-1 ); - } + ret =erofsfsck_extract_inode (&inode);if (ret && ret != -ECANCELED ) goto out;
@@ -854,6 +946,8 @@ int main(int argc, char *argv[]) } } +erofsfsck_hardlink_init (); + err =erofsfsck_check_inode (sbi.root_nid, sbi.root_nid);if (fsckcfg.corrupted) {if (!fsckcfg.extract_path)
@@ -876,6 +970,8 @@ int main(int argc, char *argv[]) } } +erofsfsck_hardlink_exit (); + exit_put_super:erofs_put_super (); exit_dev_close:
Signature · 1 line
2.17.1
Hi Yue,
Quoted 5 lines · Yue Hu
From: Yue Hu <[email protected]>
Currently hard links can't be extracted correctly, let's support it now.
Signed-off-by Yue Hu <[email protected]>
Thanks for the patch! Some minor comments below...
Quoted 9 lines
--- fsck/main.c | 152 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 124 insertions(+), 28 deletions(-)fsck/main.c +0
-0
fsck/main.c static struct option long_options[] = { · line 54
Quoted 6 lines
fsck/main.c +3
-0@@ -49,6 +49,16 @@ static struct option long_options[] = { {0, 0, 0, 0}, }; +#define NR_HARDLINK_HASHTABLE 16384 + +struct hardlink_entry {
erofsfsck_hardlink_entry {
or erofsfsck_linkentry if the above is too long
fsck/main.c static struct option long_options[] = { · line 60
Quoted 6 lines
fsck/main.c +6
-0+struct list_head list; +erofs_nid_t nid; +char *path; +}; + +static struct list_head hardlink_hashtable[NR_HARDLINK_HASHTABLE ];
erofsfsck_link_hashtable
Quoted 6 lines
fsck/main.c +1
-0+static void print_available_decompressors (FILE *f,const char *delim) {unsigned int i =0 ;@@ -550,6 +560,64 @@ static inline int erofs_extract_dir(struct erofs_inode *inode)return 0 ;
fsck/main.c static inline int erofs_extract_dir(struct erofs_inode *inode) · line 570
Quoted 10 lines
fsck/main.c +8
-0} +static char *erofsfsck_hardlink_find (erofs_nid_t nid) +{ +struct list_head *head = + &hardlink_hashtable[nid %NR_HARDLINK_HASHTABLE ]; +struct hardlink_entry *entry; + +if (list_empty (head)) +return NULL ;
why we need that?
Quoted 54 lines
fsck/main.c +50
-0+ +list_for_each_entry (entry, head, list) +if (entry->nid == nid) +return entry->path; +return NULL ; +} + +static int erofsfsck_hardlink_insert (erofs_nid_t nid,const char *path) +{ +struct hardlink_entry *entry; + + entry =malloc (sizeof (*entry)); +if (!entry) +return -ENOMEM ; + + entry->nid = nid; + entry->path =strdup (path); +if (!entry->path) +return -ENOMEM ; + +list_add_tail (&entry->list, + &hardlink_hashtable[nid %NR_HARDLINK_HASHTABLE ]); +return 0 ; +} + +static void erofsfsck_hardlink_init (void ) +{ +unsigned int i; + +for (i =0 ; i <NR_HARDLINK_HASHTABLE ; ++i) +init_list_head (&hardlink_hashtable[i]); +} + +static void erofsfsck_hardlink_exit (void ) +{ +struct hardlink_entry *entry, *n; +struct list_head *head; +unsigned int i; + +for (i =0 ; i <NR_HARDLINK_HASHTABLE ; ++i) { + head = &hardlink_hashtable[i]; + +list_for_each_entry_safe (entry, n, head, list) { +if (entry->path) +free (entry->path); +free (entry); + } + } +} +static inline int erofs_extract_file (struct erofs_inode *inode) {bool tryagain = true;
fsck/main.c static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx) · line 795
Quoted 9 lines
fsck/main.c +6
-0@@ -719,6 +787,57 @@ static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx)return ret; } +static int erofsfsck_extract_inode (struct erofs_inode *inode) +{ +int ret; +char *oldpath; + +if (!fsckcfg.extract_path ||erofs_is_packed_inode (inode)) {
why introducing erofs_is_packed_inode here?
Thanks,
Gao Xiang
Quoted 48 lines · On Tue, 27 Jun 2023 17:47:33 +0800 Gao Xiang <[email protected]>…
Hi Yue,
Quoted 5 lines · Yue Hu
From: Yue Hu <[email protected]>
Currently hard links can't be extracted correctly, let's support it now.
Signed-off-by Yue Hu <[email protected]>Thanks for the patch! Some minor comments below...
Quoted 9 lines
--- fsck/main.c | 152 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 124 insertions(+), 28 deletions(-)fsck/main.c +0
-0fsck/main.c static struct option long_options[] = { · line 54
Quoted 6 lines
fsck/main.c +3
-0@@ -49,6 +49,16 @@ static struct option long_options[] = { {0, 0, 0, 0}, }; +#define NR_HARDLINK_HASHTABLE 16384 + +struct hardlink_entry {
erofsfsck_hardlink_entry{or
erofsfsck_linkentryif the above is too longfsck/main.c static struct option long_options[] = { · line 60
Quoted 6 lines
fsck/main.c +6
-0+struct list_head list; +erofs_nid_t nid; +char *path; +}; + +static struct list_head hardlink_hashtable[NR_HARDLINK_HASHTABLE ];
erofsfsck_link_hashtableQuoted 8 lines
fsck/main.c +1
-0+static void print_available_decompressors (FILE *f,const char *delim) {unsigned int i =0 ;@@ -550,6 +560,64 @@ static inline int erofs_extract_dir(struct erofs_inode *inode)return 0 ; }
Quoted 10 lines
fsck/main.c static inline int erofs_extract_dir(struct erofs_inode *inode) · line 570
Quoted 8 lines
fsck/main.c +8
-0+static char *erofsfsck_hardlink_find (erofs_nid_t nid) +{ +struct list_head *head = + &hardlink_hashtable[nid %NR_HARDLINK_HASHTABLE ]; +struct hardlink_entry *entry; + +if (list_empty (head)) +return NULL ;why we need that?
yeah, it's unneeded, will remove it in v2.
Quoted 58 lines
Quoted 58 lines
fsck/main.c +50
-0+ +list_for_each_entry (entry, head, list) +if (entry->nid == nid) +return entry->path; +return NULL ; +} + +static int erofsfsck_hardlink_insert (erofs_nid_t nid,const char *path) +{ +struct hardlink_entry *entry; + + entry =malloc (sizeof (*entry)); +if (!entry) +return -ENOMEM ; + + entry->nid = nid; + entry->path =strdup (path); +if (!entry->path) +return -ENOMEM ; + +list_add_tail (&entry->list, + &hardlink_hashtable[nid %NR_HARDLINK_HASHTABLE ]); +return 0 ; +} + +static void erofsfsck_hardlink_init (void ) +{ +unsigned int i; + +for (i =0 ; i <NR_HARDLINK_HASHTABLE ; ++i) +init_list_head (&hardlink_hashtable[i]); +} + +static void erofsfsck_hardlink_exit (void ) +{ +struct hardlink_entry *entry, *n; +struct list_head *head; +unsigned int i; + +for (i =0 ; i <NR_HARDLINK_HASHTABLE ; ++i) { + head = &hardlink_hashtable[i]; + +list_for_each_entry_safe (entry, n, head, list) { +if (entry->path) +free (entry->path); +free (entry); + } + } +} +static inline int erofs_extract_file (struct erofs_inode *inode) {bool tryagain = true;@@ -719,6 +787,57 @@ static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx)return ret; }
Quoted 8 lines
fsck/main.c static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx) · line 795
Quoted 6 lines
fsck/main.c +6
-0+static int erofsfsck_extract_inode (struct erofs_inode *inode) +{ +int ret; +char *oldpath; + +if (!fsckcfg.extract_path ||erofs_is_packed_inode (inode)) {why introducing
erofs_is_packed_inodehere?
hardlink hashtable will be initialized after verify packed inode.
Quoted 3 lines
Thanks,
Gao Xiang
Quoted 3 lines · Yue Hu
On Tue, 27 Jun 2023 17:47:33 +0800
Gao Xiang <[email protected]> wrote:
...
Quoted 6 lines
Quoted 4 lines
fsck/main.c static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx) · line 795
Quoted 2 lines
fsck/main.c +2
-0+ +if (!fsckcfg.extract_path ||erofs_is_packed_inode (inode)) {why introducing
erofs_is_packed_inodehere?hardlink hashtable will be initialized after verify packed inode.
we could initialize it before verifing packed inode.
Thanks,
Gao Xiang