Commit e43f6ec2 authored by Konstantin Komarov's avatar Konstantin Komarov

fs/ntfs3: Print details about mount fails

Added error mesages with error codes.
Minor refactoring and code formatting.
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 16b3dbfb
...@@ -3360,7 +3360,7 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint) ...@@ -3360,7 +3360,7 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint)
ni_unlock(ni); ni_unlock(ni);
if (err) { if (err) {
ntfs_err(sb, "%s r=%lx failed, %d.", hint, inode->i_ino, err); ntfs_inode_err(inode, "%s failed, %d.", hint, err);
ntfs_set_state(sbi, NTFS_DIRTY_ERROR); ntfs_set_state(sbi, NTFS_DIRTY_ERROR);
return err; return err;
} }
......
...@@ -223,7 +223,7 @@ int ntfs_extend_init(struct ntfs_sb_info *sbi) ...@@ -223,7 +223,7 @@ int ntfs_extend_init(struct ntfs_sb_info *sbi)
inode = ntfs_iget5(sb, &ref, &NAME_EXTEND); inode = ntfs_iget5(sb, &ref, &NAME_EXTEND);
if (IS_ERR(inode)) { if (IS_ERR(inode)) {
err = PTR_ERR(inode); err = PTR_ERR(inode);
ntfs_err(sb, "Failed to load $Extend."); ntfs_err(sb, "Failed to load $Extend (%d).", err);
inode = NULL; inode = NULL;
goto out; goto out;
} }
...@@ -282,7 +282,7 @@ int ntfs_loadlog_and_replay(struct ntfs_inode *ni, struct ntfs_sb_info *sbi) ...@@ -282,7 +282,7 @@ int ntfs_loadlog_and_replay(struct ntfs_inode *ni, struct ntfs_sb_info *sbi)
/* Check for 4GB. */ /* Check for 4GB. */
if (ni->vfs_inode.i_size >= 0x100000000ull) { if (ni->vfs_inode.i_size >= 0x100000000ull) {
ntfs_err(sb, "\x24LogFile is too big"); ntfs_err(sb, "\x24LogFile is large than 4G.");
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }
...@@ -1863,7 +1863,7 @@ int ntfs_security_init(struct ntfs_sb_info *sbi) ...@@ -1863,7 +1863,7 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
inode = ntfs_iget5(sb, &ref, &NAME_SECURE); inode = ntfs_iget5(sb, &ref, &NAME_SECURE);
if (IS_ERR(inode)) { if (IS_ERR(inode)) {
err = PTR_ERR(inode); err = PTR_ERR(inode);
ntfs_err(sb, "Failed to load $Secure."); ntfs_err(sb, "Failed to load $Secure (%d).", err);
inode = NULL; inode = NULL;
goto out; goto out;
} }
...@@ -1874,45 +1874,43 @@ int ntfs_security_init(struct ntfs_sb_info *sbi) ...@@ -1874,45 +1874,43 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
attr = ni_find_attr(ni, NULL, &le, ATTR_ROOT, SDH_NAME, attr = ni_find_attr(ni, NULL, &le, ATTR_ROOT, SDH_NAME,
ARRAY_SIZE(SDH_NAME), NULL, NULL); ARRAY_SIZE(SDH_NAME), NULL, NULL);
if (!attr) { if (!attr ||
err = -EINVAL; !(root_sdh = resident_data_ex(attr, sizeof(struct INDEX_ROOT))) ||
goto out;
}
if(!(root_sdh = resident_data_ex(attr, sizeof(struct INDEX_ROOT))) ||
root_sdh->type != ATTR_ZERO || root_sdh->type != ATTR_ZERO ||
root_sdh->rule != NTFS_COLLATION_TYPE_SECURITY_HASH || root_sdh->rule != NTFS_COLLATION_TYPE_SECURITY_HASH ||
offsetof(struct INDEX_ROOT, ihdr) + offsetof(struct INDEX_ROOT, ihdr) +
le32_to_cpu(root_sdh->ihdr.used) > le32_to_cpu(root_sdh->ihdr.used) >
le32_to_cpu(attr->res.data_size)) { le32_to_cpu(attr->res.data_size)) {
ntfs_err(sb, "$Secure::$SDH is corrupted.");
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }
err = indx_init(indx_sdh, sbi, attr, INDEX_MUTEX_SDH); err = indx_init(indx_sdh, sbi, attr, INDEX_MUTEX_SDH);
if (err) if (err) {
ntfs_err(sb, "Failed to initialize $Secure::$SDH (%d).", err);
goto out; goto out;
}
attr = ni_find_attr(ni, attr, &le, ATTR_ROOT, SII_NAME, attr = ni_find_attr(ni, attr, &le, ATTR_ROOT, SII_NAME,
ARRAY_SIZE(SII_NAME), NULL, NULL); ARRAY_SIZE(SII_NAME), NULL, NULL);
if (!attr) { if (!attr ||
err = -EINVAL; !(root_sii = resident_data_ex(attr, sizeof(struct INDEX_ROOT))) ||
goto out;
}
if(!(root_sii = resident_data_ex(attr, sizeof(struct INDEX_ROOT))) ||
root_sii->type != ATTR_ZERO || root_sii->type != ATTR_ZERO ||
root_sii->rule != NTFS_COLLATION_TYPE_UINT || root_sii->rule != NTFS_COLLATION_TYPE_UINT ||
offsetof(struct INDEX_ROOT, ihdr) + offsetof(struct INDEX_ROOT, ihdr) +
le32_to_cpu(root_sii->ihdr.used) > le32_to_cpu(root_sii->ihdr.used) >
le32_to_cpu(attr->res.data_size)) { le32_to_cpu(attr->res.data_size)) {
ntfs_err(sb, "$Secure::$SII is corrupted.");
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }
err = indx_init(indx_sii, sbi, attr, INDEX_MUTEX_SII); err = indx_init(indx_sii, sbi, attr, INDEX_MUTEX_SII);
if (err) if (err) {
ntfs_err(sb, "Failed to initialize $Secure::$SII (%d).", err);
goto out; goto out;
}
fnd_sii = fnd_get(); fnd_sii = fnd_get();
if (!fnd_sii) { if (!fnd_sii) {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment