stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Chris Wilson <jakdaw@gmail.com>,
	Josef Bacik <jbacik@fusionio.com>
Subject: [ 28/38] Btrfs: fix estale with btrfs send
Date: Thu, 18 Jul 2013 22:21:44 -0700	[thread overview]
Message-ID: <20130719052049.799754215@linuxfoundation.org> (raw)
In-Reply-To: <20130719052047.858393825@linuxfoundation.org>

3.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Josef Bacik <jbacik@fusionio.com>

commit 139f807a1eba1e484941a98fb93ee32ad859a6a1 upstream.

This fixes bugzilla 57491.  If we take a snapshot of a fs with a unlink ongoing
and then try to send that root we will run into problems.  When comparing with a
parent root we will search the parents and the send roots commit_root, which if
we've just created the snapshot will include the file that needs to be evicted
by the orphan cleanup.  So when we find a changed extent we will try and copy
that info into the send stream, but when we lookup the inode we use the normal
root, which no longer has the inode because the orphan cleanup deleted it.  The
best solution I have for this is to check our otransid with the generation of
the commit root and if they match just commit the transaction again, that way we
get the changes from the orphan cleanup.  With this patch the reproducer I made
for this bugzilla no longer returns ESTALE when trying to do the send.  Thanks,

Reported-by: Chris Wilson <jakdaw@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/btrfs/send.c |   35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -4579,6 +4579,41 @@ long btrfs_ioctl_send(struct file *mnt_f
 	send_root = BTRFS_I(file_inode(mnt_file))->root;
 	fs_info = send_root->fs_info;
 
+	/*
+	 * This is done when we lookup the root, it should already be complete
+	 * by the time we get here.
+	 */
+	WARN_ON(send_root->orphan_cleanup_state != ORPHAN_CLEANUP_DONE);
+
+	/*
+	 * If we just created this root we need to make sure that the orphan
+	 * cleanup has been done and committed since we search the commit root,
+	 * so check its commit root transid with our otransid and if they match
+	 * commit the transaction to make sure everything is updated.
+	 */
+	down_read(&send_root->fs_info->extent_commit_sem);
+	if (btrfs_header_generation(send_root->commit_root) ==
+	    btrfs_root_otransid(&send_root->root_item)) {
+		struct btrfs_trans_handle *trans;
+
+		up_read(&send_root->fs_info->extent_commit_sem);
+
+		trans = btrfs_attach_transaction_barrier(send_root);
+		if (IS_ERR(trans)) {
+			if (PTR_ERR(trans) != -ENOENT) {
+				ret = PTR_ERR(trans);
+				goto out;
+			}
+			/* ENOENT means theres no transaction */
+		} else {
+			ret = btrfs_commit_transaction(trans, send_root);
+			if (ret)
+				goto out;
+		}
+	} else {
+		up_read(&send_root->fs_info->extent_commit_sem);
+	}
+
 	arg = memdup_user(arg_, sizeof(*arg));
 	if (IS_ERR(arg)) {
 		ret = PTR_ERR(arg);



  parent reply	other threads:[~2013-07-19  5:21 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-19  5:21 [ 00/38] 3.9.11-stable review Greg Kroah-Hartman
2013-07-19  5:21 ` [ 01/38] CIFS use sensible file nlink values if unprovided Greg Kroah-Hartman
2013-07-19  5:21 ` [ 02/38] CIFS: Fix a deadlock when a file is reopened Greg Kroah-Hartman
2013-07-19  5:21 ` [ 03/38] rtlwifi: rtl8723ae: Fix typo in firmware names Greg Kroah-Hartman
2013-07-19  5:21 ` [ 04/38] rtlwifi: rtl8192cu: Fix duplicate if test Greg Kroah-Hartman
2013-07-19  5:21 ` [ 05/38] jbd2: move superblock checksum calculation to jbd2_write_superblock() Greg Kroah-Hartman
2013-07-19  5:21 ` [ 06/38] jbd2: fix theoretical race in jbd2__journal_restart Greg Kroah-Hartman
2013-07-19  5:21 ` [ 07/38] ext4: fix corruption when online resizing a fs with 1K block size Greg Kroah-Hartman
2013-07-19  5:21 ` [ 08/38] ext3,ext4: dont mess with dir_file->f_pos in htree_dirblock_to_tree() Greg Kroah-Hartman
2013-07-19  5:21 ` [ 09/38] usb: gadget: f_mass_storage: add missing memory barrier for thread_wakeup_needed Greg Kroah-Hartman
2013-07-19  5:21 ` [ 10/38] xhci: check for failed dma pool allocation Greg Kroah-Hartman
2013-07-19  5:21 ` [ 11/38] usb: host: xhci-plat: release mem region while removing module Greg Kroah-Hartman
2013-07-19  5:21 ` [ 12/38] drivers: hv: switch to use mb() instead of smp_mb() Greg Kroah-Hartman
2013-07-19  5:21 ` [ 13/38] pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status Greg Kroah-Hartman
2013-07-19  5:21 ` [ 14/38] cgroup: fix umount vs cgroup_event_remove() race Greg Kroah-Hartman
2013-07-19  5:21 ` [ 15/38] xen/time: remove blocked time accounting from xen "clockchip" Greg Kroah-Hartman
2013-07-19  5:21 ` [ 16/38] xen/pcifront: Deal with toolstack missing XenbusStateClosing state Greg Kroah-Hartman
2013-07-19  5:21 ` [ 17/38] genirq: Fix can_request_irq() for IRQs without an action Greg Kroah-Hartman
2013-07-19  5:21 ` [ 18/38] drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq Greg Kroah-Hartman
2013-07-19  5:21 ` [ 19/38] ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan Greg Kroah-Hartman
2013-07-19  5:21 ` [ 20/38] ACPICA: Do not use extended sleep registers unless HW-reduced bit is set Greg Kroah-Hartman
2013-07-19  5:21 ` [ 21/38] ACPI / PM: Fix corner case in acpi_bus_update_power() Greg Kroah-Hartman
2013-07-19  5:21 ` [ 22/38] ocfs2: xattr: fix inlined xattr reflink Greg Kroah-Hartman
2013-07-19  5:21 ` [ 23/38] nbd: correct disconnect behavior Greg Kroah-Hartman
2013-07-19  5:21 ` [ 24/38] PCI: Finish SR-IOV VF setup before adding the device Greg Kroah-Hartman
2013-07-19  5:21 ` [ 25/38] PCI: Fix refcount issue in pci_create_root_bus() error recovery path Greg Kroah-Hartman
2013-07-19  5:21 ` [ 26/38] ahci: remove pmp link online check in FBS EH Greg Kroah-Hartman
2013-07-19  5:21 ` [ 27/38] timer: Fix jiffies wrap behavior of round_jiffies_common() Greg Kroah-Hartman
2013-07-19  5:21 ` Greg Kroah-Hartman [this message]
2013-07-19  5:21 ` [ 29/38] Btrfs: only do the tree_mod_log_free_eb if this is our last ref Greg Kroah-Hartman
2013-07-19  5:21 ` [ 30/38] ext4: fix data offset overflow on 32-bit archs in ext4_inline_data_fiemap() Greg Kroah-Hartman
2013-07-19  5:21 ` [ 31/38] ext4: fix overflows in SEEK_HOLE, SEEK_DATA implementations Greg Kroah-Hartman
2013-07-19  5:21 ` [ 32/38] ext4: fix data offset overflow in ext4_xattr_fiemap() on 32-bit archs Greg Kroah-Hartman
2013-07-19  5:21 ` [ 33/38] ext4: fix overflow when counting used blocks on 32-bit architectures Greg Kroah-Hartman
2013-07-19  5:21 ` [ 34/38] ext4: dont allow ext4_free_blocks() to fail due to ENOMEM Greg Kroah-Hartman
2013-07-19  5:21 ` [ 35/38] drivers/dma/pl330.c: fix locking in pl330_free_chan_resources() Greg Kroah-Hartman
2013-07-19  5:21 ` [ 36/38] memcg, kmem: fix reference count handling on the error path Greg Kroah-Hartman
2013-07-19  5:21 ` [ 37/38] mm/memory-hotplug: fix lowmem count overflow when offline pages Greg Kroah-Hartman
2013-07-19  5:21 ` [ 38/38] Handle big endianness in NTLM (ntlmv2) authentication Greg Kroah-Hartman
2013-07-19 16:45 ` [ 00/38] 3.9.11-stable review Shuah Khan
2013-07-19 19:25   ` Greg Kroah-Hartman
2013-07-19 23:47     ` Greg Kroah-Hartman
2013-07-20  0:10       ` Shuah Khan
2013-07-20 16:34         ` Shuah Khan
2013-07-20 16:50           ` Greg Kroah-Hartman
2013-07-21  0:37 ` Satoru Takeuchi
2013-07-21  1:34   ` Greg Kroah-Hartman

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=20130719052049.799754215@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=jakdaw@gmail.com \
    --cc=jbacik@fusionio.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@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).