From patchwork Wed Feb 13 12:14:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 10809679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 269A11399 for ; Wed, 13 Feb 2019 12:14:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19EE429FD5 for ; Wed, 13 Feb 2019 12:14:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DF392A400; Wed, 13 Feb 2019 12:14:15 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 64C7529FD5 for ; Wed, 13 Feb 2019 12:14:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729932AbfBMMON (ORCPT ); Wed, 13 Feb 2019 07:14:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:48558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726030AbfBMMON (ORCPT ); Wed, 13 Feb 2019 07:14:13 -0500 Received: from localhost.localdomain (bl8-197-74.dsl.telepac.pt [85.241.197.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 908B8222B1 for ; Wed, 13 Feb 2019 12:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550060052; bh=FtaJxyrNDiDv/nbSVQYZs/ELSTpTPyyUTlLkZN2qpD4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=RqiSQJnsb/TN53IcT/FqTqybvt68Sv2s86ofWwculWUJ1YISObcZM4xUCxb93h2i/ ieL9lNF7klx5bwqY+5zIx01Tlp1/0RRAZURvBB+eBxSc/goiik1QB4YOzYAL6DsuYe KoZhSLC6FCOCckBHMFJEcUizSIkW/89cG7wpHUmw= From: fdmanana@kernel.org To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 2/2] Btrfs: fix fsync after succession of renames and unlink/rmdir Date: Wed, 13 Feb 2019 12:14:09 +0000 Message-Id: <20190213121409.5400-1-fdmanana@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190212180649.32675-1-fdmanana@kernel.org> References: <20190212180649.32675-1-fdmanana@kernel.org> 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 From: Filipe Manana After a succession of renames operations of different files and unlinking one of them, if we fsync one of the renamed files we can end up with a log that will either fail to replay at mount time or result in a filesystem that is in an inconsistent state. One example scenario: $ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ mkdir /mnt/testdir $ touch /mnt/testdir/fname1 $ touch /mnt/testdir/fname2 $ sync $ mv /mnt/testdir/fname1 /mnt/testdir/fname3 $ rm -f /mnt/testdir/fname2 $ ln /mnt/testdir/fname3 /mnt/testdir/fname2 $ touch /mnt/testdir/fname1 $ xfs_io -c "fsync" /mnt/testdir/fname1 $ mount /dev/sdb /mnt $ umount /mnt $ btrfs check /dev/sdb [1/7] checking root items [2/7] checking extents [3/7] checking free space cache [4/7] checking fs roots root 5 inode 259 errors 2, no orphan item ERROR: errors found in fs roots Opening filesystem to check... Checking filesystem on /dev/sdc UUID: 20e4abb8-5a19-4492-8bb4-6084125c2d0d found 393216 bytes used, error(s) found total csum bytes: 0 total tree bytes: 131072 total fs tree bytes: 32768 total extent tree bytes: 16384 btree space waste bytes: 122986 file data blocks allocated: 262144 referenced 262144 On a kernel without the first patch in this series, titled "[PATCH] Btrfs: fix fsync after succession of renames of different files", we get instead an error when mounting the filesystem due to failure of replaying the log: $ mount /dev/sdb /mnt mount: mount /dev/sdb on /mnt failed: File exists Fix this by logging the parent directory of an inode whenever we find an inode that no longer exists (was unlinked in the current transaction), during the procedure which finds inodes that have old names that collide with new names of other inodes. A test case for fstests follows soon. Signed-off-by: Filipe Manana --- V2: Silenced a false lockdep warning. fs/btrfs/tree-log.c | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index eda5c91accd1..8c9e87f5ec58 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -27,6 +27,7 @@ #define LOG_INODE_ALL 0 #define LOG_INODE_EXISTS 1 #define LOG_OTHER_INODE 2 +#define LOG_OTHER_INODE_ALL 3 /* * directory trouble cases @@ -4782,7 +4783,8 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb, const int slot, const struct btrfs_key *key, struct btrfs_inode *inode, - u64 *other_ino) + u64 *other_ino, + u64 *other_parent) { int ret; struct btrfs_path *search_path; @@ -4848,6 +4850,7 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb, if (di_key.objectid != key->objectid) { ret = 1; *other_ino = di_key.objectid; + *other_parent = parent; } else { ret = 0; } @@ -4872,6 +4875,7 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb, struct btrfs_ino_list { u64 ino; + u64 parent; struct list_head list; }; @@ -4879,7 +4883,8 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, struct btrfs_log_ctx *ctx, - u64 ino) + u64 ino, + u64 parent) { struct btrfs_ino_list *ino_elem; LIST_HEAD(inode_list); @@ -4889,6 +4894,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans, if (!ino_elem) return -ENOMEM; ino_elem->ino = ino; + ino_elem->parent = parent; list_add_tail(&ino_elem->list, &inode_list); while (!list_empty(&inode_list)) { @@ -4899,6 +4905,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans, ino_elem = list_first_entry(&inode_list, struct btrfs_ino_list, list); ino = ino_elem->ino; + parent = ino_elem->parent; list_del(&ino_elem->list); kfree(ino_elem); if (ret) @@ -4912,13 +4919,25 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans, inode = btrfs_iget(fs_info->sb, &key, root, NULL); /* * If the other inode that had a conflicting dir entry was - * deleted in the current transaction, we don't need to do more - * work nor fallback to a transaction commit. + * deleted in the current transaction, we need to log its parent + * directory. */ if (IS_ERR(inode)) { ret = PTR_ERR(inode); - if (ret == -ENOENT) - ret = 0; + if (ret == -ENOENT) { + key.objectid = parent; + inode = btrfs_iget(fs_info->sb, &key, root, + NULL); + if (IS_ERR(inode)) { + ret = PTR_ERR(inode); + } else { + ret = btrfs_log_inode(trans, root, + BTRFS_I(inode), + LOG_OTHER_INODE_ALL, + 0, LLONG_MAX, ctx); + iput(inode); + } + } continue; } /* @@ -4948,6 +4967,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans, struct extent_buffer *leaf = path->nodes[0]; int slot = path->slots[0]; u64 other_ino = 0; + u64 other_parent = 0; if (slot >= btrfs_header_nritems(leaf)) { ret = btrfs_next_leaf(root, path); @@ -4970,7 +4990,8 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans, ret = btrfs_check_ref_name_override(leaf, slot, &key, BTRFS_I(inode), - &other_ino); + &other_ino, + &other_parent); if (ret < 0) break; if (ret > 0) { @@ -4980,6 +5001,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans, break; } ino_elem->ino = other_ino; + ino_elem->parent = other_parent; list_add_tail(&ino_elem->list, &inode_list); ret = 0; } @@ -5030,7 +5052,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, u64 logged_isize = 0; bool need_log_inode_item = true; bool xattrs_logged = false; - bool recursive_logging = (inode_only == LOG_OTHER_INODE); + bool recursive_logging = false; path = btrfs_alloc_path(); if (!path) @@ -5076,8 +5098,13 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, return ret; } - if (inode_only == LOG_OTHER_INODE) { - inode_only = LOG_INODE_EXISTS; + if (inode_only == LOG_OTHER_INODE || + inode_only == LOG_OTHER_INODE_ALL) { + recursive_logging = true; + if (inode_only == LOG_OTHER_INODE) + inode_only = LOG_INODE_EXISTS; + else + inode_only = LOG_INODE_ALL; mutex_lock_nested(&inode->log_mutex, SINGLE_DEPTH_NESTING); } else { mutex_lock(&inode->log_mutex); @@ -5175,10 +5202,11 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, inode->generation == trans->transid && !recursive_logging) { u64 other_ino = 0; + u64 other_parent = 0; ret = btrfs_check_ref_name_override(path->nodes[0], path->slots[0], &min_key, inode, - &other_ino); + &other_ino, &other_parent); if (ret < 0) { err = ret; goto out_unlock; @@ -5201,7 +5229,8 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, ins_nr = 0; err = log_conflicting_inodes(trans, root, path, - ctx, other_ino); + ctx, other_ino, + other_parent); if (err) goto out_unlock; btrfs_release_path(path);