From: David Sterba <dsterba@suse.cz>
To: Josef Bacik <jbacik@fb.com>
Cc: linux-btrfs@vger.kernel.org, guihc.fnst@cn.fujitsu.com
Subject: Re: [PATCH] Btrfs-progs: deal with invalid key orderings and bad orphan items
Date: Thu, 12 Dec 2013 19:28:42 +0100 [thread overview]
Message-ID: <20131212182842.GU6498@twin.jikos.cz> (raw)
In-Reply-To: <1386779134-16228-1-git-send-email-jbacik@fb.com>
On Wed, Dec 11, 2013 at 11:25:34AM -0500, Josef Bacik wrote:
> @@ -5527,15 +5734,16 @@ again:
> }
> btrfs_release_path(&path);
> while(1) {
> - ret = run_next_block(root, bits, bits_nr, &last, &pending,
> - &seen, &reada, &nodes, &extent_cache,
> - &chunk_cache, &dev_cache,
> + ret = run_next_block(trans, root, bits, bits_nr, &last,
> + &pending, &seen, &reada, &nodes,
> + &extent_cache, &chunk_cache, &dev_cache,
> &block_group_cache, &dev_extent_cache);
> if (ret != 0)
> break;
> }
>
> - ret = check_extent_refs(trans, root, &extent_cache);
> + if (ret >= 0)
> + ret = check_extent_refs(trans, root, &extent_cache);
> if (ret == -EAGAIN) {
> ret = btrfs_commit_transaction(trans, root);
> if (ret)
This hunk conflicts with Gui Hecheng's patch
"Btrfs-progs: fix btrfsck improper prompt on dropping snapshots"
I applied the change where necessary, but haven't reviewed if this does
not break the semantics. You may want to take a look.
thanks,
david
next prev parent reply other threads:[~2013-12-12 18:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-11 16:25 [PATCH] Btrfs-progs: deal with invalid key orderings and bad orphan items Josef Bacik
2013-12-12 18:28 ` David Sterba [this message]
2013-12-12 19:22 ` Josef Bacik
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=20131212182842.GU6498@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=guihc.fnst@cn.fujitsu.com \
--cc=jbacik@fb.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).