Snap for 4773106 from f7135ed552cf454fbf9b1c1208c23c28f4c864fe to pi-release
Change-Id: I78b8d9ced49ff7cb4f9ce726286ac7e06da94637
diff --git a/fsck/fsck.c b/fsck/fsck.c
index 6c1b9a7..668ecc1 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -1764,19 +1764,7 @@
if (fsck_chk_orphan_node(sbi))
return -EINVAL;
- /* 5. check quota inode simply */
- if (fsck_chk_quota_node(sbi))
- return -EINVAL;
-
- if (fsck->nat_valid_inode_cnt != le32_to_cpu(cp->valid_inode_count)) {
- ASSERT_MSG("valid inode does not match: nat_valid_inode_cnt %u,"
- " valid_inode_count %u",
- fsck->nat_valid_inode_cnt,
- le32_to_cpu(cp->valid_inode_count));
- return -EINVAL;
- }
-
- /*check nat entry with sit_area_bitmap*/
+ /* 5. check nat entry -- must be done before quota check */
for (i = 0; i < fsck->nr_nat_entries; i++) {
u32 blk = le32_to_cpu(fsck->entries[i].block_addr);
nid_t ino = le32_to_cpu(fsck->entries[i].ino);
@@ -1816,6 +1804,18 @@
}
}
+ /* 6. check quota inode simply */
+ if (fsck_chk_quota_node(sbi))
+ return -EINVAL;
+
+ if (fsck->nat_valid_inode_cnt != le32_to_cpu(cp->valid_inode_count)) {
+ ASSERT_MSG("valid inode does not match: nat_valid_inode_cnt %u,"
+ " valid_inode_count %u",
+ fsck->nat_valid_inode_cnt,
+ le32_to_cpu(cp->valid_inode_count));
+ return -EINVAL;
+ }
+
return 0;
}
diff --git a/fsck/sload.c b/fsck/sload.c
index 2842f2c..e9b12e3 100644
--- a/fsck/sload.c
+++ b/fsck/sload.c
@@ -106,7 +106,7 @@
/* Permissions */
if (fs_config_func != NULL) {
- fs_config_func(mnt_path, S_ISDIR(de->mode),
+ fs_config_func(mnt_path, de->file_type == F2FS_FT_DIR,
c.target_out_dir, &uid, &gid, &imode,
&capabilities);
de->uid = uid & 0xffff;
@@ -157,7 +157,7 @@
de->size = stat.st_size;
de->mode = stat.st_mode &
- (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO);
+ (S_IFMT|S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO);
if (c.fixed_time == -1 && c.from_dir)
de->mtime = stat.st_mtime;
else
