diff mbox

[2/2] btrfs-progs: cmds-check.c: supports inode isize fix in lowmem

Message ID 20170109053808.1979-2-suy.fnst@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Su Yue Jan. 9, 2017, 5:38 a.m. UTC 
Add a function 'repair_inode_isize' to support inode isize repair.

Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
---
 cmds-check.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

Comments

David Sterba Jan. 17, 2017, 3:46 p.m. UTC | #1 
On Mon, Jan 09, 2017 at 01:38:08PM +0800, Su Yue wrote:
> Add a function 'repair_inode_isize' to support inode isize repair.

Similar comments to this patch, missng path init and the error message
level.

> Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
> ---
>  cmds-check.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 48 insertions(+), 1 deletion(-)
> 
> diff --git a/cmds-check.c b/cmds-check.c
> index 567ca80..088c0d8 100644
> --- a/cmds-check.c
> +++ b/cmds-check.c
> @@ -2457,6 +2457,45 @@ out:
>  }
>  
>  /*
> + * Set inode's isize to correct value in @info

Please make it more detailed why the new value is correct one.

> + *
> + * 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;

'ei' looks like a copy-paste from some code that uses extent item, if
the variable name should be a mnemonic, so please use 'ii'.

> +	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
> @@ -2484,7 +2523,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 */
> @@ -2505,6 +2544,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;
> @@ -5039,6 +5085,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
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/cmds-check.c b/cmds-check.c
index 567ca80..088c0d8 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -2457,6 +2457,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
@@ -2484,7 +2523,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 */
@@ -2505,6 +2544,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;
@@ -5039,6 +5085,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);
 		}