On Tue, Oct 4, 2011 at 10:54 AM, Josef Bacik <josef@xxxxxxxxxx> wrote:
> I noticed while running xfstests 83 that if we didn't have enough space to
> delete our inode the orphan cleanup would just loop. This is because it keeps
> finding the same orphan item and keeps trying to kill it but can't because we
> don't get an error back from iput for deleting the inode. So keep track of the
> last guy we tried to kill, if it's the same as the one we're trying to kill
> currently we know we are having problems and can just error out. I don't have a
> way to test this so look hard and make sure it's right. Thanks,
>
> Signed-off-by: Josef Bacik <josef@xxxxxxxxxx>
> ---
> V1->V2: set last_objectid properly
>
> fs/btrfs/inode.c | 11 +++++++++++
> 1 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 446531a..595a807 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -2230,6 +2230,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
> struct btrfs_key key, found_key;
> struct btrfs_trans_handle *trans;
> struct inode *inode;
> + u64 last_objectid = 0;
> int ret = 0, nr_unlink = 0, nr_truncate = 0;
>
> if (cmpxchg(&root->orphan_cleanup_state, 0, ORPHAN_CLEANUP_STARTED))
> @@ -2281,6 +2282,16 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
> * crossing root thing. we store the inode number in the
> * offset of the orphan item.
> */
> +
> + if (found_key.offset == last_objectid) {
> + printk(KERN_ERR "btrfs: Error removing orphan entry, "
> + "stopping orphan cleanup\n");
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + last_objectid = found_key.offset;
> +
> found_key.objectid = found_key.offset;
> found_key.type = BTRFS_INODE_ITEM_KEY;
> found_key.offset = 0;
> --
> 1.7.5.2
>
Just in case it gets lost in the shuffle between github and
git.kernel.org, and also for the benefit of those testing Chris
Mason's integration-test branch on github, please note that version 1
of this patch is still in Chris' integration-test branch, as well as
in Josef's github kernel repos (master and for-chris branch only, the
unstable branch has this version of the patch).
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
