<div dir="ltr"><div dir="ltr"><div>From 9b3c3256d3a630a7bfe825201e9ba06d67a81618 Mon Sep 17 00:00:00 2001</div><div>From: Igor Ostapenko <<a href="mailto:igoreisberg@gmail.com">igoreisberg@gmail.com</a>></div><div>Date: Sat, 18 Dec 2021 18:01:46 +0200</div><div>Subject: erofs-utils: fsck support for --extract=X to extract to path X</div><div><br></div><div>Extracts dirs, regular files and symlinks (overwrite enabled with warnings,</div><div>mainly for use with WSL for debugging, in case certain files overlap,</div><div>i.e. "path/to/file/alarm" and "path/to/file/Alarm").</div><div>Allocation for extract_path is done only once, then the buffer is reused.</div><div>Raw and compressed data chunks are handled with a unified function to avoid</div><div>repeats, compressed data is verified lineary (with EROFS_GET_BLOCKS_FIEMAP)</div><div>instead of lookback, as it's problematic to extract data when looping</div><div>backwards.</div><div><br></div><div>Signed-off-by: Igor Ostapenko <<a href="mailto:igoreisberg@gmail.com">igoreisberg@gmail.com</a>></div><div>---</div><div> fsck/main.c | 482 ++++++++++++++++++++++++++++++++++++----------------</div><div> mkfs/main.c |   2 +-</div><div> 2 files changed, 339 insertions(+), 145 deletions(-)</div><div><br></div><div>diff --git a/fsck/main.c b/fsck/main.c</div><div>index 30d0a1b..36d5d76 100644</div><div>--- a/fsck/main.c</div><div>+++ b/fsck/main.c</div><div>@@ -6,6 +6,8 @@</div><div> #include <stdlib.h></div><div> #include <getopt.h></div><div> #include <time.h></div><div>+#include <utime.h></div><div>+#include <unistd.h></div><div> #include <sys/stat.h></div><div> #include "erofs/print.h"</div><div> #include "erofs/io.h"</div><div>@@ -18,6 +20,10 @@ struct erofsfsck_cfg {</div><div> <span style="white-space:pre">      </span>bool corrupted;</div><div> <span style="white-space:pre">     </span>bool print_comp_ratio;</div><div> <span style="white-space:pre">      </span>bool check_decomp;</div><div>+<span style="white-space:pre">   </span>char *extract_path;</div><div>+<span style="white-space:pre">  </span>size_t extract_pos;</div><div>+<span style="white-space:pre">  </span>int extract_fd;</div><div>+<span style="white-space:pre">      </span>bool preserve;</div><div> <span style="white-space:pre">      </span>u64 physical_blocks;</div><div> <span style="white-space:pre">        </span>u64 logical_blocks;</div><div> };</div><div>@@ -25,8 +31,9 @@ static struct erofsfsck_cfg fsckcfg;</div><div> </div><div> static struct option long_options[] = {</div><div> <span style="white-space:pre">        </span>{"help", no_argument, 0, 1},</div><div>-<span style="white-space:pre">       </span>{"extract", no_argument, 0, 2},</div><div>-<span style="white-space:pre">    </span>{"device", required_argument, 0, 3},</div><div>+<span style="white-space:pre">       </span>{"extract", optional_argument, 0, 2},</div><div>+<span style="white-space:pre">      </span>{"preserve", no_argument, 0, 3},</div><div>+<span style="white-space:pre">   </span>{"device", required_argument, 0, 4},</div><div> <span style="white-space:pre">      </span>{0, 0, 0, 0},</div><div> };</div><div> </div><div>@@ -34,12 +41,13 @@ static void usage(void)</div><div> {</div><div> <span style="white-space:pre">       </span>fputs("usage: [options] IMAGE\n\n"</div><div> <span style="white-space:pre">        </span>      "Check erofs filesystem integrity of IMAGE, and [options] are:\n"</div><div>-<span style="white-space:pre"> </span>      " -V              print the version number of fsck.erofs and exit.\n"</div><div>+<span style="white-space:pre">      </span>      " -V              print the version number of fsck.erofs and exit\n"</div><div> <span style="white-space:pre">      </span>      " -d#             set output message level to # (maximum 9)\n"</div><div> <span style="white-space:pre">    </span>      " -p              print total compression ratio of all files\n"</div><div> <span style="white-space:pre">   </span>      " --device=X      specify an extra device to be used together\n"</div><div>-<span style="white-space:pre">       </span>      " --extract       check if all files are well encoded\n"</div><div>-<span style="white-space:pre">      </span>      " --help          display this help and exit.\n",</div><div>+<span style="white-space:pre">    </span>      " --extract[=X]   check if all files are well encoded, optionally extract to X\n"</div><div>+<span style="white-space:pre">       </span>      " --preserve      preserve mode, owner and group (--extract=X is required)\n"</div><div>+<span style="white-space:pre">  </span>      " --help          display this help and exit\n",</div><div> <span style="white-space:pre">    </span>      stderr);</div><div> }</div><div> </div><div>@@ -74,8 +82,29 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)</div><div> <span style="white-space:pre">                 </span>exit(0);</div><div> <span style="white-space:pre">            </span>case 2:</div><div> <span style="white-space:pre">                     </span>fsckcfg.check_decomp = true;</div><div>+<span style="white-space:pre">                 </span>if (optarg) {</div><div>+<span style="white-space:pre">                                </span>size_t len = strlen(optarg);</div><div>+<span style="white-space:pre">                         </span>if (len == 0)</div><div>+<span style="white-space:pre">                                        </span>return -EINVAL;</div><div>+<span style="white-space:pre">                              </span>/* remove trailing slashes except root */</div><div>+<span style="white-space:pre">                            </span>while (len > 1 && optarg[len - 1] == '/')</div><div>+<span style="white-space:pre">                                 </span>len--;</div><div>+</div><div>+<span style="white-space:pre">                               </span>fsckcfg.extract_path = malloc(PATH_MAX);</div><div>+<span style="white-space:pre">                             </span>if (!fsckcfg.extract_path)</div><div>+<span style="white-space:pre">                                   </span>return -ENOMEM;</div><div>+</div><div>+<span style="white-space:pre">                              </span>strncpy(fsckcfg.extract_path, optarg, len);</div><div>+<span style="white-space:pre">                          </span>fsckcfg.extract_path[len] = '\0';</div><div>+<span style="white-space:pre">                            </span>if (optarg[0] == '/')</div><div>+<span style="white-space:pre">                                        </span>len = 0;</div><div>+<span style="white-space:pre">                             </span>fsckcfg.extract_pos = len;</div><div>+<span style="white-space:pre">                   </span>}</div><div> <span style="white-space:pre">                   </span>break;</div><div> <span style="white-space:pre">              </span>case 3:</div><div>+<span style="white-space:pre">                      </span>fsckcfg.preserve = true;</div><div>+<span style="white-space:pre">                     </span>break;</div><div>+<span style="white-space:pre">               </span>case 4:</div><div> <span style="white-space:pre">                     </span>ret = blob_open_ro(optarg);</div><div> <span style="white-space:pre">                 </span>if (ret)</div><div> <span style="white-space:pre">                            </span>return ret;</div><div>@@ -89,6 +118,9 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)</div><div> <span style="white-space:pre">  </span>if (optind >= argc)</div><div> <span style="white-space:pre">              </span>return -EINVAL;</div><div> </div><div>+<span style="white-space:pre">     </span>if (fsckcfg.preserve && !fsckcfg.extract_path)</div><div>+<span style="white-space:pre">               </span>return -EINVAL;</div><div>+</div><div> <span style="white-space:pre">     </span>cfg.c_img_path = strdup(argv[optind++]);</div><div> <span style="white-space:pre">    </span>if (!cfg.c_img_path)</div><div> <span style="white-space:pre">                </span>return -ENOMEM;</div><div>@@ -100,6 +132,25 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)</div><div> <span style="white-space:pre">    </span>return 0;</div><div> }</div><div> </div><div>+static void erofsfsck_restore_stat(struct erofs_inode *inode, char *path)</div><div>+{</div><div>+<span style="white-space:pre">       </span>int ret;</div><div>+<span style="white-space:pre">     </span>struct utimbuf ut;</div><div>+</div><div>+<span style="white-space:pre">   </span>ret = chmod(path, inode->i_mode);</div><div>+<span style="white-space:pre"> </span>if (ret < 0)</div><div>+<span style="white-space:pre">              </span>erofs_warn("failed to set permissions: %s", path);</div><div>+</div><div>+<span style="white-space:pre"> </span>ret = chown(path, inode->i_uid, inode->i_gid);</div><div>+<span style="white-space:pre"> </span>if (ret < 0)</div><div>+<span style="white-space:pre">              </span>erofs_warn("failed to change ownership: %s", path);</div><div>+</div><div>+<span style="white-space:pre">        </span>ut.actime = inode->i_ctime;</div><div>+<span style="white-space:pre">       </span>ut.modtime = inode->i_ctime;</div><div>+<span style="white-space:pre">      </span>if (utime(path, &ut) < 0)</div><div>+<span style="white-space:pre">             </span>erofs_warn("failed to set times: %s", path);</div><div>+}</div><div>+</div><div> static int erofs_check_sb_chksum(void)</div><div> {</div><div> <span style="white-space:pre">    </span>int ret;</div><div>@@ -127,137 +178,6 @@ static int erofs_check_sb_chksum(void)</div><div> <span style="white-space:pre"> </span>return 0;</div><div> }</div><div> </div><div>-static int verify_uncompressed_inode(struct erofs_inode *inode)</div><div>-{</div><div>-<span style="white-space:pre"> </span>struct erofs_map_blocks map = {</div><div>-<span style="white-space:pre">              </span>.index = UINT_MAX,</div><div>-<span style="white-space:pre">   </span>};</div><div>-<span style="white-space:pre">   </span>int ret;</div><div>-<span style="white-space:pre">     </span>erofs_off_t ptr = 0;</div><div>-<span style="white-space:pre"> </span>u64 i_blocks = DIV_ROUND_UP(inode->i_size, EROFS_BLKSIZ);</div><div>-</div><div>-<span style="white-space:pre"> </span>while (ptr < inode->i_size) {</div><div>-<span style="white-space:pre">          </span>map.m_la = ptr;</div><div>-<span style="white-space:pre">              </span>ret = erofs_map_blocks(inode, &map, 0);</div><div>-<span style="white-space:pre">          </span>if (ret)</div><div>-<span style="white-space:pre">                     </span>return ret;</div><div>-</div><div>-<span style="white-space:pre">          </span>if (map.m_plen != map.m_llen || ptr != map.m_la) {</div><div>-<span style="white-space:pre">                   </span>erofs_err("broken data chunk layout m_la %" PRIu64 " ptr %" PRIu64 " m_llen %" PRIu64 " m_plen %" PRIu64,</div><div>-<span style="white-space:pre">                            </span>  map.m_la, ptr, map.m_llen, map.m_plen);</div><div>-<span style="white-space:pre">                   </span>return -EFSCORRUPTED;</div><div>-<span style="white-space:pre">                </span>}</div><div>-</div><div>-<span style="white-space:pre">            </span>if (!(map.m_flags & EROFS_MAP_MAPPED) && !map.m_llen) {</div><div>-<span style="white-space:pre">                  </span>/* reached EOF */</div><div>-<span style="white-space:pre">                    </span>ptr = inode->i_size;</div><div>-<span style="white-space:pre">                      </span>continue;</div><div>-<span style="white-space:pre">            </span>}</div><div>-</div><div>-<span style="white-space:pre">            </span>ptr += map.m_llen;</div><div>-<span style="white-space:pre">   </span>}</div><div>-</div><div>-<span style="white-space:pre">    </span>if (fsckcfg.print_comp_ratio) {</div><div>-<span style="white-space:pre">              </span>fsckcfg.logical_blocks += i_blocks;</div><div>-<span style="white-space:pre">          </span>fsckcfg.physical_blocks += i_blocks;</div><div>-<span style="white-space:pre"> </span>}</div><div>-</div><div>-<span style="white-space:pre">    </span>return 0;</div><div>-}</div><div>-</div><div>-static int verify_compressed_inode(struct erofs_inode *inode)</div><div>-{</div><div>-<span style="white-space:pre">     </span>struct erofs_map_blocks map = {</div><div>-<span style="white-space:pre">              </span>.index = UINT_MAX,</div><div>-<span style="white-space:pre">   </span>};</div><div>-<span style="white-space:pre">   </span>struct erofs_map_dev mdev;</div><div>-<span style="white-space:pre">   </span>int ret = 0;</div><div>-<span style="white-space:pre"> </span>u64 pchunk_len = 0;</div><div>-<span style="white-space:pre">  </span>erofs_off_t end = inode->i_size;</div><div>-<span style="white-space:pre">  </span>unsigned int raw_size = 0, buffer_size = 0;</div><div>-<span style="white-space:pre">  </span>char *raw = NULL, *buffer = NULL;</div><div>-</div><div>-<span style="white-space:pre">    </span>while (end > 0) {</div><div>-<span style="white-space:pre">         </span>map.m_la = end - 1;</div><div>-</div><div>-<span style="white-space:pre">          </span>ret = z_erofs_map_blocks_iter(inode, &map, 0);</div><div>-<span style="white-space:pre">           </span>if (ret)</div><div>-<span style="white-space:pre">                     </span>goto out;</div><div>-</div><div>-<span style="white-space:pre">            </span>if (end > map.m_la + map.m_llen) {</div><div>-<span style="white-space:pre">                        </span>erofs_err("broken compressed chunk layout m_la %" PRIu64 " m_llen %" PRIu64 " end %" PRIu64,</div><div>-<span style="white-space:pre">                           </span>  map.m_la, map.m_llen, end);</div><div>-<span style="white-space:pre">                       </span>ret = -EFSCORRUPTED;</div><div>-<span style="white-space:pre">                 </span>goto out;</div><div>-<span style="white-space:pre">            </span>}</div><div>-</div><div>-<span style="white-space:pre">            </span>pchunk_len += map.m_plen;</div><div>-<span style="white-space:pre">            </span>end = map.m_la;</div><div>-</div><div>-<span style="white-space:pre">              </span>if (!fsckcfg.check_decomp || !(map.m_flags & EROFS_MAP_MAPPED))</div><div>-<span style="white-space:pre">                  </span>continue;</div><div>-</div><div>-<span style="white-space:pre">            </span>if (map.m_plen > raw_size) {</div><div>-<span style="white-space:pre">                      </span>raw_size = map.m_plen;</div><div>-<span style="white-space:pre">                       </span>raw = realloc(raw, raw_size);</div><div>-<span style="white-space:pre">                        </span>BUG_ON(!raw);</div><div>-<span style="white-space:pre">                </span>}</div><div>-</div><div>-<span style="white-space:pre">            </span>if (map.m_llen > buffer_size) {</div><div>-<span style="white-space:pre">                   </span>buffer_size = map.m_llen;</div><div>-<span style="white-space:pre">                    </span>buffer = realloc(buffer, buffer_size);</div><div>-<span style="white-space:pre">                       </span>BUG_ON(!buffer);</div><div>-<span style="white-space:pre">             </span>}</div><div>-</div><div>-<span style="white-space:pre">            </span>mdev = (struct erofs_map_dev) {</div><div>-<span style="white-space:pre">                      </span>.m_deviceid = map.m_deviceid,</div><div>-<span style="white-space:pre">                        </span>.m_pa = map.m_pa,</div><div>-<span style="white-space:pre">            </span>};</div><div>-<span style="white-space:pre">           </span>ret = erofs_map_dev(&sbi, &mdev);</div><div>-<span style="white-space:pre">            </span>if (ret) {</div><div>-<span style="white-space:pre">                   </span>erofs_err("failed to map device of m_pa %" PRIu64 ", m_deviceid %u @ nid %llu: %d",</div><div>-<span style="white-space:pre">                              </span>  map.m_pa, map.m_deviceid, inode->nid | 0ULL, ret);</div><div>-<span style="white-space:pre">                     </span>goto out;</div><div>-<span style="white-space:pre">            </span>}</div><div>-</div><div>-<span style="white-space:pre">            </span>ret = dev_read(mdev.m_deviceid, raw, mdev.m_pa, map.m_plen);</div><div>-<span style="white-space:pre">         </span>if (ret < 0) {</div><div>-<span style="white-space:pre">                    </span>erofs_err("failed to read compressed data of m_pa %" PRIu64 ", m_plen %" PRIu64 " @ nid %llu: %d",</div><div>-<span style="white-space:pre">                             </span>  mdev.m_pa, map.m_plen, inode->nid | 0ULL, ret);</div><div>-<span style="white-space:pre">                        </span>goto out;</div><div>-<span style="white-space:pre">            </span>}</div><div>-</div><div>-<span style="white-space:pre">            </span>ret = z_erofs_decompress(&(struct z_erofs_decompress_req) {</div><div>-<span style="white-space:pre">                                      </span>.in = raw,</div><div>-<span style="white-space:pre">                                   </span>.out = buffer,</div><div>-<span style="white-space:pre">                                       </span>.decodedskip = 0,</div><div>-<span style="white-space:pre">                                    </span>.inputsize = map.m_plen,</div><div>-<span style="white-space:pre">                                     </span>.decodedlength = map.m_llen,</div><div>-<span style="white-space:pre">                                 </span>.alg = map.m_algorithmformat,</div><div>-<span style="white-space:pre">                                        </span>.partial_decoding = 0</div><div>-<span style="white-space:pre">                                        </span> });</div><div>-</div><div>-<span style="white-space:pre">         </span>if (ret < 0) {</div><div>-<span style="white-space:pre">                    </span>erofs_err("failed to decompress data of m_pa %" PRIu64 ", m_plen %" PRIu64 " @ nid %llu: %d",</div><div>-<span style="white-space:pre">                          </span>  mdev.m_pa, map.m_plen, inode->nid | 0ULL, ret);</div><div>-<span style="white-space:pre">                        </span>goto out;</div><div>-<span style="white-space:pre">            </span>}</div><div>-<span style="white-space:pre">    </span>}</div><div>-</div><div>-<span style="white-space:pre">    </span>if (fsckcfg.print_comp_ratio) {</div><div>-<span style="white-space:pre">              </span>fsckcfg.logical_blocks +=</div><div>-<span style="white-space:pre">                    </span>DIV_ROUND_UP(inode->i_size, EROFS_BLKSIZ);</div><div>-<span style="white-space:pre">                </span>fsckcfg.physical_blocks +=</div><div>-<span style="white-space:pre">                   </span>DIV_ROUND_UP(pchunk_len, EROFS_BLKSIZ);</div><div>-<span style="white-space:pre">      </span>}</div><div>-out:</div><div>-<span style="white-space:pre">        </span>if (raw)</div><div>-<span style="white-space:pre">             </span>free(raw);</div><div>-<span style="white-space:pre">   </span>if (buffer)</div><div>-<span style="white-space:pre">          </span>free(buffer);</div><div>-<span style="white-space:pre">        </span>return ret < 0 ? ret : 0;</div><div>-}</div><div>-</div><div> static int erofs_verify_xattr(struct erofs_inode *inode)</div><div> {</div><div> <span style="white-space:pre">    </span>unsigned int xattr_hdr_size = sizeof(struct erofs_xattr_ibody_header);</div><div>@@ -338,7 +258,16 @@ out:</div><div> </div><div> static int erofs_verify_inode_data(struct erofs_inode *inode)</div><div> {</div><div>-<span style="white-space:pre">      </span>int ret;</div><div>+<span style="white-space:pre">     </span>struct erofs_map_blocks map = {</div><div>+<span style="white-space:pre">              </span>.index = UINT_MAX,</div><div>+<span style="white-space:pre">   </span>};</div><div>+<span style="white-space:pre">   </span>struct erofs_map_dev mdev;</div><div>+<span style="white-space:pre">   </span>int ret = 0;</div><div>+<span style="white-space:pre"> </span>bool compressed;</div><div>+<span style="white-space:pre">     </span>erofs_off_t ptr = 0;</div><div>+<span style="white-space:pre"> </span>u64 pchunk_len = 0;</div><div>+<span style="white-space:pre">  </span>unsigned int raw_size = 0, buffer_size = 0;</div><div>+<span style="white-space:pre">  </span>char *raw = NULL, *buffer = NULL;</div><div> </div><div> <span style="white-space:pre">  </span>erofs_dbg("verify data chunk of nid(%llu): type(%d)",</div><div> <span style="white-space:pre">             </span>  inode->nid | 0ULL, inode->datalayout);</div><div>@@ -347,30 +276,275 @@ static int erofs_verify_inode_data(struct erofs_inode *inode)</div><div> <span style="white-space:pre">  </span>case EROFS_INODE_FLAT_PLAIN:</div><div> <span style="white-space:pre">        </span>case EROFS_INODE_FLAT_INLINE:</div><div> <span style="white-space:pre">       </span>case EROFS_INODE_CHUNK_BASED:</div><div>-<span style="white-space:pre">                </span>ret = verify_uncompressed_inode(inode);</div><div>+<span style="white-space:pre">              </span>compressed = false;</div><div> <span style="white-space:pre">         </span>break;</div><div> <span style="white-space:pre">      </span>case EROFS_INODE_FLAT_COMPRESSION_LEGACY:</div><div> <span style="white-space:pre">   </span>case EROFS_INODE_FLAT_COMPRESSION:</div><div>-<span style="white-space:pre">           </span>ret = verify_compressed_inode(inode);</div><div>+<span style="white-space:pre">                </span>compressed = true;</div><div> <span style="white-space:pre">          </span>break;</div><div> <span style="white-space:pre">      </span>default:</div><div>-<span style="white-space:pre">             </span>ret = -EINVAL;</div><div>-<span style="white-space:pre">               </span>break;</div><div>+<span style="white-space:pre">               </span>erofs_err("unknown datalayout");</div><div>+<span style="white-space:pre">           </span>return -EINVAL;</div><div> <span style="white-space:pre">     </span>}</div><div> </div><div>+<span style="white-space:pre">   </span>while (ptr < inode->i_size) {</div><div>+<span style="white-space:pre">          </span>map.m_la = ptr;</div><div>+<span style="white-space:pre">              </span>if (compressed)</div><div>+<span style="white-space:pre">                      </span>ret = z_erofs_map_blocks_iter(inode, &map, EROFS_GET_BLOCKS_FIEMAP);</div><div>+<span style="white-space:pre">             </span>else</div><div>+<span style="white-space:pre">                 </span>ret = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_FIEMAP);</div><div>+<span style="white-space:pre">            </span>if (ret)</div><div>+<span style="white-space:pre">                     </span>goto out;</div><div>+</div><div>+<span style="white-space:pre">            </span>if (compressed) {</div><div>+<span style="white-space:pre">                    </span>if (ptr != map.m_la || map.m_la + map.m_llen > inode->i_size) {</div><div>+<span style="white-space:pre">                                </span>erofs_err("broken compressed chunk layout ptr %" PRIu64 " m_la %" PRIu64 " m_llen %" PRIu64 " i_size %" PRIu64,</div><div>+<span style="white-space:pre">                                      </span>  ptr, map.m_la, map.m_llen, inode->i_size);</div><div>+<span style="white-space:pre">                             </span>ret = -EFSCORRUPTED;</div><div>+<span style="white-space:pre">                         </span>goto out;</div><div>+<span style="white-space:pre">                    </span>}</div><div>+<span style="white-space:pre">            </span>} else {</div><div>+<span style="white-space:pre">                     </span>if (ptr != map.m_la || map.m_llen != map.m_plen) {</div><div>+<span style="white-space:pre">                           </span>erofs_err("broken data chunk layout ptr %" PRIu64 " m_la %" PRIu64 " m_llen %" PRIu64 " m_plen %" PRIu64,</div><div>+<span style="white-space:pre">                                    </span>  ptr, map.m_la, map.m_llen, map.m_plen);</div><div>+<span style="white-space:pre">                           </span>ret = -EFSCORRUPTED;</div><div>+<span style="white-space:pre">                         </span>goto out;</div><div>+<span style="white-space:pre">                    </span>}</div><div>+</div><div>+<span style="white-space:pre">                    </span>if (map.m_la + map.m_llen > inode->i_size)</div><div>+<span style="white-space:pre">                             </span>map.m_llen = inode->i_size - map.m_la;</div><div>+<span style="white-space:pre">            </span>}</div><div>+</div><div>+<span style="white-space:pre">            </span>pchunk_len += map.m_plen;</div><div>+<span style="white-space:pre">            </span>ptr += map.m_llen;</div><div>+</div><div>+<span style="white-space:pre">           </span>/* reached EOF? */</div><div>+<span style="white-space:pre">           </span>if (!(map.m_flags & EROFS_MAP_MAPPED) && !map.m_llen)</div><div>+<span style="white-space:pre">                    </span>break;</div><div>+</div><div>+<span style="white-space:pre">               </span>/* should skip decomp? */</div><div>+<span style="white-space:pre">            </span>if (!fsckcfg.check_decomp)</div><div>+<span style="white-space:pre">                   </span>continue;</div><div>+</div><div>+<span style="white-space:pre">            </span>if (map.m_plen > raw_size) {</div><div>+<span style="white-space:pre">                      </span>raw_size = map.m_plen;</div><div>+<span style="white-space:pre">                       </span>raw = realloc(raw, raw_size);</div><div>+<span style="white-space:pre">                        </span>BUG_ON(!raw);</div><div>+<span style="white-space:pre">                </span>}</div><div>+</div><div>+<span style="white-space:pre">            </span>if (compressed && map.m_llen > buffer_size) {</div><div>+<span style="white-space:pre">                     </span>buffer_size = map.m_llen;</div><div>+<span style="white-space:pre">                    </span>buffer = realloc(buffer, buffer_size);</div><div>+<span style="white-space:pre">                       </span>BUG_ON(!buffer);</div><div>+<span style="white-space:pre">             </span>}</div><div>+</div><div>+<span style="white-space:pre">            </span>mdev = (struct erofs_map_dev) {</div><div>+<span style="white-space:pre">                      </span>.m_deviceid = map.m_deviceid,</div><div>+<span style="white-space:pre">                        </span>.m_pa = map.m_pa,</div><div>+<span style="white-space:pre">            </span>};</div><div>+<span style="white-space:pre">           </span>ret = erofs_map_dev(&sbi, &mdev);</div><div>+<span style="white-space:pre">            </span>if (ret) {</div><div>+<span style="white-space:pre">                   </span>erofs_err("failed to map device of m_pa %" PRIu64 ", m_deviceid %u @ nid %llu: %d",</div><div>+<span style="white-space:pre">                              </span>  map.m_pa, map.m_deviceid, inode->nid | 0ULL, ret);</div><div>+<span style="white-space:pre">                     </span>goto out;</div><div>+<span style="white-space:pre">            </span>}</div><div>+</div><div>+<span style="white-space:pre">            </span>ret = dev_read(mdev.m_deviceid, raw, mdev.m_pa, map.m_plen);</div><div>+<span style="white-space:pre">         </span>if (ret < 0) {</div><div>+<span style="white-space:pre">                    </span>erofs_err("failed to read data of m_pa %" PRIu64 ", m_plen %" PRIu64 " @ nid %llu: %d",</div><div>+<span style="white-space:pre">                                </span>  mdev.m_pa, map.m_plen, inode->nid | 0ULL, ret);</div><div>+<span style="white-space:pre">                        </span>goto out;</div><div>+<span style="white-space:pre">            </span>}</div><div>+</div><div>+<span style="white-space:pre">            </span>if (compressed) {</div><div>+<span style="white-space:pre">                    </span>ret = z_erofs_decompress(&(struct z_erofs_decompress_req) {</div><div>+<span style="white-space:pre">                                              </span>.in = raw,</div><div>+<span style="white-space:pre">                                           </span>.out = buffer,</div><div>+<span style="white-space:pre">                                               </span>.decodedskip = 0,</div><div>+<span style="white-space:pre">                                            </span>.inputsize = map.m_plen,</div><div>+<span style="white-space:pre">                                             </span>.decodedlength = map.m_llen,</div><div>+<span style="white-space:pre">                                         </span>.alg = map.m_algorithmformat,</div><div>+<span style="white-space:pre">                                                </span>.partial_decoding = 0</div><div>+<span style="white-space:pre">                                                </span> });</div><div>+</div><div>+<span style="white-space:pre">                 </span>if (ret < 0) {</div><div>+<span style="white-space:pre">                            </span>erofs_err("failed to decompress data of m_pa %" PRIu64 ", m_plen %" PRIu64 " @ nid %llu: %d",</div><div>+<span style="white-space:pre">                                  </span>  mdev.m_pa, map.m_plen, inode->nid | 0ULL, ret);</div><div>+<span style="white-space:pre">                                </span>goto out;</div><div>+<span style="white-space:pre">                    </span>}</div><div>+<span style="white-space:pre">            </span>}</div><div>+</div><div>+<span style="white-space:pre">            </span>if (fsckcfg.extract_fd != -1 &&</div><div>+<span style="white-space:pre">                      </span>  write(fsckcfg.extract_fd, compressed ? buffer : raw, map.m_llen) < 0) {</div><div>+<span style="white-space:pre">                        </span>ret = -EIO;</div><div>+<span style="white-space:pre">                  </span>goto out;</div><div>+<span style="white-space:pre">            </span>}</div><div>+<span style="white-space:pre">    </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>if (fsckcfg.print_comp_ratio) {</div><div>+<span style="white-space:pre">              </span>fsckcfg.logical_blocks +=</div><div>+<span style="white-space:pre">                    </span>DIV_ROUND_UP(inode->i_size, EROFS_BLKSIZ);</div><div>+<span style="white-space:pre">                </span>fsckcfg.physical_blocks +=</div><div>+<span style="white-space:pre">                   </span>DIV_ROUND_UP(pchunk_len, EROFS_BLKSIZ);</div><div>+<span style="white-space:pre">      </span>}</div><div>+out:</div><div>+<span style="white-space:pre">        </span>if (raw)</div><div>+<span style="white-space:pre">             </span>free(raw);</div><div>+<span style="white-space:pre">   </span>if (buffer)</div><div>+<span style="white-space:pre">          </span>free(buffer);</div><div> <span style="white-space:pre">       </span>if (ret == -EIO)</div><div> <span style="white-space:pre">            </span>erofs_err("I/O error occurred when verifying data chunk of nid(%llu)",</div><div> <span style="white-space:pre">                    </span>  inode->nid | 0ULL);</div><div>+<span style="white-space:pre">    </span>return ret < 0 ? ret : 0;</div><div>+}</div><div>+</div><div>+static inline int erofs_extract_dir(struct erofs_inode *inode)</div><div>+{</div><div>+<span style="white-space:pre"> </span>int ret;</div><div>+<span style="white-space:pre">     </span>struct stat sb;</div><div>+</div><div>+<span style="white-space:pre">      </span>/* verify data chunk layout */</div><div>+<span style="white-space:pre">       </span>ret = erofs_verify_inode_data(inode);</div><div>+<span style="white-space:pre">        </span>if (ret)</div><div>+<span style="white-space:pre">             </span>return ret;</div><div>+</div><div>+<span style="white-space:pre">  </span>erofs_dbg("create directory on path: %s", fsckcfg.extract_path);</div><div>+</div><div>+<span style="white-space:pre">   </span>if (!lstat(fsckcfg.extract_path, &sb)) {</div><div>+<span style="white-space:pre">         </span>if (!S_ISDIR(sb.st_mode)) {</div><div>+<span style="white-space:pre">                  </span>erofs_err("path is not a directory: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">                    </span>return -EIO;</div><div>+<span style="white-space:pre">         </span>}</div><div>+<span style="white-space:pre">    </span>} else if (errno != ENOENT || mkdir(fsckcfg.extract_path, S_IRWXU) < 0) {</div><div>+<span style="white-space:pre">         </span>erofs_err("failed to create directory: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">         </span>return -EIO;</div><div>+<span style="white-space:pre"> </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>if (fsckcfg.preserve)</div><div>+<span style="white-space:pre">                </span>erofsfsck_restore_stat(inode, fsckcfg.extract_path);</div><div>+<span style="white-space:pre"> </span>return 0;</div><div>+}</div><div>+</div><div>+static inline int erofs_extract_file(struct erofs_inode *inode)</div><div>+{</div><div>+<span style="white-space:pre">   </span>int ret;</div><div>+<span style="white-space:pre">     </span>struct stat sb;</div><div>+<span style="white-space:pre">      </span>int fsync_fail, close_fail;</div><div>+</div><div>+<span style="white-space:pre">  </span>erofs_dbg("extract file to path: %s", fsckcfg.extract_path);</div><div>+</div><div>+<span style="white-space:pre">       </span>if (!lstat(fsckcfg.extract_path, &sb)) {</div><div>+<span style="white-space:pre">         </span>if (S_ISDIR(sb.st_mode)) {</div><div>+<span style="white-space:pre">                   </span>erofs_err("path is a directory: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">                        </span>return -EIO;</div><div>+<span style="white-space:pre">         </span>}</div><div>+<span style="white-space:pre">            </span>erofs_warn("overwriting: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">               </span>if (unlink(fsckcfg.extract_path) < 0) {</div><div>+<span style="white-space:pre">                   </span>erofs_err("failed to remove file: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">                      </span>return -EIO;</div><div>+<span style="white-space:pre">         </span>}</div><div>+<span style="white-space:pre">    </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>fsckcfg.extract_fd = open(fsckcfg.extract_path, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU);</div><div>+<span style="white-space:pre">      </span>if (fsckcfg.extract_fd < 0) {</div><div>+<span style="white-space:pre">             </span>erofs_err("failed to open file: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">                </span>return -EIO;</div><div>+<span style="white-space:pre"> </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>/* verify data chunk layout */</div><div>+<span style="white-space:pre">       </span>ret = erofs_verify_inode_data(inode);</div><div>+</div><div>+<span style="white-space:pre">        </span>fsync_fail = fsync(fsckcfg.extract_fd) != 0;</div><div>+<span style="white-space:pre"> </span>close_fail = close(fsckcfg.extract_fd) != 0;</div><div>+<span style="white-space:pre"> </span>fsckcfg.extract_fd = -1;</div><div>+</div><div>+<span style="white-space:pre">     </span>if (ret)</div><div>+<span style="white-space:pre">             </span>return ret;</div><div>+<span style="white-space:pre">  </span>if (fsync_fail || close_fail)</div><div>+<span style="white-space:pre">                </span>return -EIO;</div><div>+<span style="white-space:pre"> </span>if (fsckcfg.preserve)</div><div>+<span style="white-space:pre">                </span>erofsfsck_restore_stat(inode, fsckcfg.extract_path);</div><div>+<span style="white-space:pre"> </span>return ret;</div><div>+}</div><div>+</div><div>+static inline int erofs_extract_symlink(struct erofs_inode *inode)</div><div>+{</div><div>+<span style="white-space:pre">      </span>int ret;</div><div>+<span style="white-space:pre">     </span>struct stat sb;</div><div>+<span style="white-space:pre">      </span>char *buf = NULL;</div><div>+</div><div>+<span style="white-space:pre">    </span>/* verify data chunk layout */</div><div>+<span style="white-space:pre">       </span>ret = erofs_verify_inode_data(inode);</div><div>+<span style="white-space:pre">        </span>if (ret)</div><div>+<span style="white-space:pre">             </span>return ret;</div><div> </div><div>+<span style="white-space:pre"> </span>erofs_dbg("extract symlink to path: %s", fsckcfg.extract_path);</div><div>+</div><div>+<span style="white-space:pre">    </span>if (!lstat(fsckcfg.extract_path, &sb)) {</div><div>+<span style="white-space:pre">         </span>if (S_ISDIR(sb.st_mode)) {</div><div>+<span style="white-space:pre">                   </span>erofs_err("path is a directory: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">                        </span>return -EIO;</div><div>+<span style="white-space:pre">         </span>}</div><div>+<span style="white-space:pre">            </span>erofs_warn("overwriting: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">               </span>if (unlink(fsckcfg.extract_path) < 0) {</div><div>+<span style="white-space:pre">                   </span>erofs_err("failed to remove file: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">                      </span>return -EIO;</div><div>+<span style="white-space:pre">         </span>}</div><div>+<span style="white-space:pre">    </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>buf = malloc(inode->i_size + 1);</div><div>+<span style="white-space:pre">  </span>if (!buf) {</div><div>+<span style="white-space:pre">          </span>ret = -ENOMEM;</div><div>+<span style="white-space:pre">               </span>goto out;</div><div>+<span style="white-space:pre">    </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>ret = erofs_pread(inode, buf, inode->i_size, 0);</div><div>+<span style="white-space:pre">  </span>if (ret) {</div><div>+<span style="white-space:pre">           </span>erofs_err("I/O error occurred when reading symlink @ nid %llu: %d",</div><div>+<span style="white-space:pre">                        </span>  inode->nid | 0ULL, ret);</div><div>+<span style="white-space:pre">               </span>goto out;</div><div>+<span style="white-space:pre">    </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>buf[inode->i_size] = '\0';</div><div>+<span style="white-space:pre">        </span>if (symlink(buf, fsckcfg.extract_path) < 0) {</div><div>+<span style="white-space:pre">             </span>erofs_err("failed to create symlink: %s", fsckcfg.extract_path);</div><div>+<span style="white-space:pre">           </span>ret = -EIO;</div><div>+<span style="white-space:pre">          </span>goto out;</div><div>+<span style="white-space:pre">    </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>if (fsckcfg.preserve)</div><div>+<span style="white-space:pre">                </span>erofsfsck_restore_stat(inode, fsckcfg.extract_path);</div><div>+out:</div><div>+<span style="white-space:pre">     </span>if (buf)</div><div>+<span style="white-space:pre">             </span>free(buf);</div><div> <span style="white-space:pre">  </span>return ret;</div><div> }</div><div> </div><div> static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx)</div><div> {</div><div>+<span style="white-space:pre">     </span>int ret;</div><div>+<span style="white-space:pre">     </span>size_t prev_pos = fsckcfg.extract_pos;</div><div>+</div><div> <span style="white-space:pre">      </span>if (ctx->dot_dotdot)</div><div> <span style="white-space:pre">             </span>return 0;</div><div> </div><div>-<span style="white-space:pre">   </span>return erofsfsck_check_inode(ctx->dir->nid, ctx->de_nid);</div><div>+<span style="white-space:pre">   </span>if (fsckcfg.extract_path) {</div><div>+<span style="white-space:pre">          </span>size_t curr_pos = prev_pos;</div><div>+</div><div>+<span style="white-space:pre">          </span>fsckcfg.extract_path[curr_pos++] = '/';</div><div>+<span style="white-space:pre">              </span>strncpy(fsckcfg.extract_path + curr_pos, ctx->dname, ctx->de_namelen);</div><div>+<span style="white-space:pre">         </span>curr_pos += ctx->de_namelen;</div><div>+<span style="white-space:pre">              </span>fsckcfg.extract_path[curr_pos] = '\0';</div><div>+<span style="white-space:pre">               </span>fsckcfg.extract_pos = curr_pos;</div><div>+<span style="white-space:pre">      </span>}</div><div>+</div><div>+<span style="white-space:pre">    </span>ret = erofsfsck_check_inode(ctx->dir->nid, ctx->de_nid);</div><div>+</div><div>+<span style="white-space:pre">    </span>if (fsckcfg.extract_path) {</div><div>+<span style="white-space:pre">          </span>fsckcfg.extract_path[prev_pos] = '\0';</div><div>+<span style="white-space:pre">               </span>fsckcfg.extract_pos = prev_pos;</div><div>+<span style="white-space:pre">      </span>}</div><div>+<span style="white-space:pre">    </span>return ret;</div><div> }</div><div> </div><div> static int erofsfsck_check_inode(erofs_nid_t pnid, erofs_nid_t nid)</div><div>@@ -394,8 +568,25 @@ static int erofsfsck_check_inode(erofs_nid_t pnid, erofs_nid_t nid)</div><div> <span style="white-space:pre">   </span>if (ret)</div><div> <span style="white-space:pre">            </span>goto out;</div><div> </div><div>-<span style="white-space:pre">   </span>/* verify data chunk layout */</div><div>-<span style="white-space:pre">       </span>ret = erofs_verify_inode_data(&inode);</div><div>+<span style="white-space:pre">   </span>if (fsckcfg.extract_path) {</div><div>+<span style="white-space:pre">          </span>switch (inode.i_mode & S_IFMT) {</div><div>+<span style="white-space:pre">         </span>case S_IFDIR:</div><div>+<span style="white-space:pre">                        </span>ret = erofs_extract_dir(&inode);</div><div>+<span style="white-space:pre">                 </span>break;</div><div>+<span style="white-space:pre">               </span>case S_IFREG:</div><div>+<span style="white-space:pre">                        </span>ret = erofs_extract_file(&inode);</div><div>+<span style="white-space:pre">                        </span>break;</div><div>+<span style="white-space:pre">               </span>case S_IFLNK:</div><div>+<span style="white-space:pre">                        </span>ret = erofs_extract_symlink(&inode);</div><div>+<span style="white-space:pre">                     </span>break;</div><div>+<span style="white-space:pre">               </span>default:</div><div>+<span style="white-space:pre">                     </span>goto verify;</div><div>+<span style="white-space:pre">         </span>}</div><div>+<span style="white-space:pre">    </span>} else {</div><div>+verify:</div><div>+<span style="white-space:pre">              </span>/* verify data chunk layout */</div><div>+<span style="white-space:pre">               </span>ret = erofs_verify_inode_data(&inode);</div><div>+<span style="white-space:pre">   </span>}</div><div> <span style="white-space:pre">   </span>if (ret)</div><div> <span style="white-space:pre">            </span>goto out;</div><div> </div><div>@@ -425,6 +616,9 @@ int main(int argc, char **argv)</div><div> <span style="white-space:pre">        </span>fsckcfg.corrupted = false;</div><div> <span style="white-space:pre">  </span>fsckcfg.print_comp_ratio = false;</div><div> <span style="white-space:pre">   </span>fsckcfg.check_decomp = false;</div><div>+<span style="white-space:pre">        </span>fsckcfg.extract_path = NULL;</div><div>+<span style="white-space:pre"> </span>fsckcfg.extract_pos = 0;</div><div>+<span style="white-space:pre">     </span>fsckcfg.extract_fd = -1;</div><div> <span style="white-space:pre">    </span>fsckcfg.logical_blocks = 0;</div><div> <span style="white-space:pre"> </span>fsckcfg.physical_blocks = 0;</div><div> </div><div>diff --git a/mkfs/main.c b/mkfs/main.c</div><div>index 90cedde..1787b2c 100644</div><div>--- a/mkfs/main.c</div><div>+++ b/mkfs/main.c</div><div>@@ -589,7 +589,7 @@ int main(int argc, char **argv)</div><div> <span style="white-space:pre">    </span>err = lstat64(cfg.c_src_path, &st);</div><div> <span style="white-space:pre">     </span>if (err)</div><div> <span style="white-space:pre">            </span>return 1;</div><div>-<span style="white-space:pre">    </span>if ((st.st_mode & S_IFMT) != S_IFDIR) {</div><div>+<span style="white-space:pre">  </span>if (!S_ISDIR(st.st_mode)) {</div><div> <span style="white-space:pre">         </span>erofs_err("root of the filesystem is not a directory - %s",</div><div> <span style="white-space:pre">                       </span>  cfg.c_src_path);</div><div> <span style="white-space:pre">         </span>usage();</div><div>-- </div><div>2.30.2</div><div><br></div></div></div>