From patchwork Wed Jun 6 07:27:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 10449769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4C78F6053F for ; Wed, 6 Jun 2018 07:27:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34D50298C2 for ; Wed, 6 Jun 2018 07:27:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27FC8298D1; Wed, 6 Jun 2018 07:27:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0E4B298C2 for ; Wed, 6 Jun 2018 07:27:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932286AbeFFH10 (ORCPT ); Wed, 6 Jun 2018 03:27:26 -0400 Received: from mx2.suse.de ([195.135.220.15]:60365 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932265AbeFFH1Y (ORCPT ); Wed, 6 Jun 2018 03:27:24 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 140EDADB4 for ; Wed, 6 Jun 2018 07:27:23 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 3/6] btrfs-progs: check/original: Detect and repair wrong inline ram_bytes Date: Wed, 6 Jun 2018 15:27:14 +0800 Message-Id: <20180606072717.28854-4-wqu@suse.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180606072717.28854-1-wqu@suse.com> References: <20180606072717.28854-1-wqu@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It looks like that around 2014, btrfs kernel has a regression that would cause offset-by-one ram_bytes for inline extent. Add the ability to repair it in original mode. Reported-by: Steve Leung Signed-off-by: Qu Wenruo --- check/main.c | 44 +++++++++++++++++++++++++++++++++++++++++-- check/mode-original.h | 1 + 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/check/main.c b/check/main.c index 52ef181add61..1374d8856d72 100644 --- a/check/main.c +++ b/check/main.c @@ -1483,6 +1483,9 @@ static int process_file_extent(struct btrfs_root *root, } else { if (num_bytes > max_inline_size) rec->errors |= I_ERR_FILE_EXTENT_TOO_LARGE; + if (btrfs_file_extent_inline_item_len(eb, item) != + num_bytes) + rec->errors |= I_ERR_INLINE_RAM_BYTES_WRONG; } rec->found_size += num_bytes; num_bytes = (num_bytes + mask) & ~mask; @@ -2534,6 +2537,40 @@ out: return ret; } +static int repair_inline_ram_bytes(struct btrfs_trans_handle *trans, + struct btrfs_root *root, + struct btrfs_path *path, + struct inode_record *rec) +{ + struct btrfs_key key; + struct btrfs_file_extent_item *fi; + struct btrfs_item *i; + u64 on_disk_item_len; + int ret; + + key.objectid = rec->ino; + key.offset = 0; + key.type = BTRFS_EXTENT_DATA_KEY; + + ret = btrfs_search_slot(trans, root, &key, path, 0, 1); + if (ret > 0) + ret = -ENOENT; + if (ret < 0) + goto out; + + i = btrfs_item_nr(path->slots[0]); + on_disk_item_len = btrfs_file_extent_inline_item_len(path->nodes[0], i); + fi = btrfs_item_ptr(path->nodes[0], path->slots[0], + struct btrfs_file_extent_item); + btrfs_set_file_extent_ram_bytes(path->nodes[0], fi, on_disk_item_len); + btrfs_mark_buffer_dirty(path->nodes[0]); + printf("Successfully repaired inline ram_bytes for root %llu ino %llu\n", + root->objectid, rec->ino); +out: + btrfs_release_path(path); + return ret; +} + static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec) { struct btrfs_trans_handle *trans; @@ -2545,8 +2582,9 @@ static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec) I_ERR_LINK_COUNT_WRONG | I_ERR_NO_INODE_ITEM | I_ERR_FILE_EXTENT_ORPHAN | - I_ERR_FILE_EXTENT_DISCOUNT| - I_ERR_FILE_NBYTES_WRONG))) + I_ERR_FILE_EXTENT_DISCOUNT | + I_ERR_FILE_NBYTES_WRONG | + I_ERR_INLINE_RAM_BYTES_WRONG))) return rec->errors; /* @@ -2575,6 +2613,8 @@ static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec) ret = repair_inode_nlinks(trans, root, &path, rec); if (!ret && rec->errors & I_ERR_FILE_NBYTES_WRONG) ret = repair_inode_nbytes(trans, root, &path, rec); + if (!ret && rec->errors & I_ERR_INLINE_RAM_BYTES_WRONG) + ret = repair_inline_ram_bytes(trans, root, &path, rec); btrfs_commit_transaction(trans, root); btrfs_release_path(&path); return ret; diff --git a/check/mode-original.h b/check/mode-original.h index 13cfa5b9e1b3..ec2842e0b3be 100644 --- a/check/mode-original.h +++ b/check/mode-original.h @@ -187,6 +187,7 @@ struct file_extent_hole { #define I_ERR_FILE_EXTENT_ORPHAN (1 << 14) #define I_ERR_FILE_EXTENT_TOO_LARGE (1 << 15) #define I_ERR_ODD_INODE_FLAGS (1 << 16) +#define I_ERR_INLINE_RAM_BYTES_WRONG (1 << 17) struct inode_record { struct list_head backrefs;