From: Su Yue <suy.fnst@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Cc: <dsterba@suse.com>
Subject: [PATCH v3 2/3] btrfs-progs: cmds-check.c: supports inode isize fix in lowmem
Date: Thu, 12 Jan 2017 11:53:29 +0800 [thread overview]
Message-ID: <20170112035330.21376-2-suy.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <20170112035330.21376-1-suy.fnst@cn.fujitsu.com>
Add a function 'repair_inode_isize' to support inode isize repair.
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
---
v2: none
v3: none
---
cmds-check.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/cmds-check.c b/cmds-check.c
index dad10cb..6947420 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -2458,6 +2458,45 @@ out:
}
/*
+ * Set inode's isize to correct value in @info
+ *
+ * Returns <0 means on error
+ * Returns 0 means successful repair
+ */
+static int repair_inode_isize_lowmem(struct btrfs_trans_handle *trans,
+ struct btrfs_root *root,
+ struct inode_item_fix_info *info)
+{
+ struct btrfs_inode_item *ei;
+ struct btrfs_key key;
+ struct btrfs_path path;
+ int ret;
+
+ ASSERT(info);
+ key.objectid = info->ino;
+ key.type = BTRFS_INODE_ITEM_KEY;
+ key.offset = 0;
+
+ ret = btrfs_search_slot(trans, root, &key, &path, 0, 1);
+ if (ret < 0)
+ goto out;
+ if (ret > 0) {
+ ret = -ENOENT;
+ goto out;
+ }
+
+ ei = btrfs_item_ptr(path.nodes[0], path.slots[0],
+ struct btrfs_inode_item);
+ btrfs_set_inode_size(path.nodes[0], ei, info->isize);
+ btrfs_mark_buffer_dirty(path.nodes[0]);
+ printf("reset isize for inode %llu root %llu\n", info->ino,
+ root->root_key.objectid);
+out:
+ btrfs_release_path(&path);
+ return ret;
+}
+
+/*
* repair_inode_item - repair inode item errors
*
* Repair the inode item if error can be repaired. Any caller should compare
@@ -2485,7 +2524,7 @@ static int repair_inode_item(struct btrfs_root *root,
ret = 0;
goto out;
}
- if (!(err & NBYTES_ERROR)) {
+ if (!(err & NBYTES_ERROR) && !(err & ISIZE_ERROR)) {
warning("root %llu INODE[%llu] have error(s) can't repair, error : %d",
root->objectid, info->ino, err);
/* can't fix any errors, ret should be positive */
@@ -2506,6 +2545,13 @@ static int repair_inode_item(struct btrfs_root *root,
else if (ret < 0)
goto out;
}
+ if (err & ISIZE_ERROR) {
+ ret = repair_inode_isize_lowmem(trans, root, info);
+ if (ret == 0)
+ err &= ~ISIZE_ERROR;
+ else if (ret < 0)
+ goto out;
+ }
if (err != info->err) {
info->err = err;
@@ -5040,6 +5086,7 @@ out:
if (isize != size) {
err |= ISIZE_ERROR;
+ info->isize = size;
error("root %llu DIR INODE [%llu] size(%llu) not equal to %llu",
root->objectid, inode_id, isize, size);
}
--
2.11.0
next prev parent reply other threads:[~2017-01-12 3:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-12 3:53 [PATCH v3 1/3] btrfs-progs: cmds-check.c: supports inode nbytes fix in lowmem Su Yue
2017-01-12 3:53 ` Su Yue [this message]
2017-01-12 3:53 ` [PATCH v3 3/3] btrfs-progs: fsck-tests/016: lowmem mode check for images Su Yue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170112035330.21376-2-suy.fnst@cn.fujitsu.com \
--to=suy.fnst@cn.fujitsu.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).