Revert "f2fs: fix to do sanity check on direct node in truncate_dnode()"
This reverts commit a78a8bcdc2
which is
commit a6ec83786ab9f13f25fb18166dee908845713a95 upstream.
Something is currently broken in the f2fs code, Guenter has reported
boot problems with it for a few releases now, so revert the most recent
f2fs changes in the hope to get this back to a working filesystem.
Reported-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/b392e1a8-b987-4993-bd45-035db9415a6e@roeck-us.net
Cc: Chao Yu <chao@kernel.org>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c5bd20577f
commit
db05f8449b
@ -3431,6 +3431,7 @@ static inline bool __is_valid_data_blkaddr(block_t blkaddr)
|
|||||||
* file.c
|
* file.c
|
||||||
*/
|
*/
|
||||||
int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
|
int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
|
||||||
|
void f2fs_truncate_data_blocks(struct dnode_of_data *dn);
|
||||||
int f2fs_do_truncate_blocks(struct inode *inode, u64 from, bool lock);
|
int f2fs_do_truncate_blocks(struct inode *inode, u64 from, bool lock);
|
||||||
int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock);
|
int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock);
|
||||||
int f2fs_truncate(struct inode *inode);
|
int f2fs_truncate(struct inode *inode);
|
||||||
|
@ -628,6 +628,11 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
|
|||||||
dn->ofs_in_node, nr_free);
|
dn->ofs_in_node, nr_free);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void f2fs_truncate_data_blocks(struct dnode_of_data *dn)
|
||||||
|
{
|
||||||
|
f2fs_truncate_data_blocks_range(dn, ADDRS_PER_BLOCK(dn->inode));
|
||||||
|
}
|
||||||
|
|
||||||
static int truncate_partial_data_page(struct inode *inode, u64 from,
|
static int truncate_partial_data_page(struct inode *inode, u64 from,
|
||||||
bool cache_only)
|
bool cache_only)
|
||||||
{
|
{
|
||||||
|
@ -923,7 +923,6 @@ static int truncate_node(struct dnode_of_data *dn)
|
|||||||
|
|
||||||
static int truncate_dnode(struct dnode_of_data *dn)
|
static int truncate_dnode(struct dnode_of_data *dn)
|
||||||
{
|
{
|
||||||
struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
|
|
||||||
struct page *page;
|
struct page *page;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
@ -931,25 +930,16 @@ static int truncate_dnode(struct dnode_of_data *dn)
|
|||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/* get direct node */
|
/* get direct node */
|
||||||
page = f2fs_get_node_page(sbi, dn->nid);
|
page = f2fs_get_node_page(F2FS_I_SB(dn->inode), dn->nid);
|
||||||
if (PTR_ERR(page) == -ENOENT)
|
if (PTR_ERR(page) == -ENOENT)
|
||||||
return 1;
|
return 1;
|
||||||
else if (IS_ERR(page))
|
else if (IS_ERR(page))
|
||||||
return PTR_ERR(page);
|
return PTR_ERR(page);
|
||||||
|
|
||||||
if (IS_INODE(page) || ino_of_node(page) != dn->inode->i_ino) {
|
|
||||||
f2fs_err(sbi, "incorrect node reference, ino: %lu, nid: %u, ino_of_node: %u",
|
|
||||||
dn->inode->i_ino, dn->nid, ino_of_node(page));
|
|
||||||
set_sbi_flag(sbi, SBI_NEED_FSCK);
|
|
||||||
f2fs_handle_error(sbi, ERROR_INVALID_NODE_REFERENCE);
|
|
||||||
f2fs_put_page(page, 1);
|
|
||||||
return -EFSCORRUPTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Make dnode_of_data for parameter */
|
/* Make dnode_of_data for parameter */
|
||||||
dn->node_page = page;
|
dn->node_page = page;
|
||||||
dn->ofs_in_node = 0;
|
dn->ofs_in_node = 0;
|
||||||
f2fs_truncate_data_blocks_range(dn, ADDRS_PER_BLOCK(dn->inode));
|
f2fs_truncate_data_blocks(dn);
|
||||||
err = truncate_node(dn);
|
err = truncate_node(dn);
|
||||||
if (err) {
|
if (err) {
|
||||||
f2fs_put_page(page, 1);
|
f2fs_put_page(page, 1);
|
||||||
|
@ -104,7 +104,6 @@ enum f2fs_error {
|
|||||||
ERROR_INCONSISTENT_SIT,
|
ERROR_INCONSISTENT_SIT,
|
||||||
ERROR_CORRUPTED_VERITY_XATTR,
|
ERROR_CORRUPTED_VERITY_XATTR,
|
||||||
ERROR_CORRUPTED_XATTR,
|
ERROR_CORRUPTED_XATTR,
|
||||||
ERROR_INVALID_NODE_REFERENCE,
|
|
||||||
ERROR_MAX,
|
ERROR_MAX,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user