On Thu, Mar 28, 2013 at 01:59:10PM -0400, Josef Bacik wrote:
> Commit 9bf7a4890518186238d2579be16ecc5190a707c0 upstream, 3.8 definitely and I
> think 3.5 but nothing earlier, thanks.
Thanks, I'll queue this for the 3.5 kernel.
Cheers,
--
Luis
>
> We need to inc the nlink of deleted entries when running replay so we
> can do the unlink on the fs_root and get everything cleaned up and
> then have the orphan cleanup do the right thing. The problem is
> inc_nlink complains about this, even thought it still does the right
> thing. So use set_nlink() if our i_nlink is 0 to keep users from
> seeing the warnings during log replay. Thanks,
>
> Signed-off-by: Josef Bacik <jbacik@xxxxxxxxxxxx>
> ---
> fs/btrfs/tree-log.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index c7ef569..451fad9 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -1382,7 +1382,10 @@ static noinline int link_to_fixup_dir(struct btrfs_trans_handle *trans,
>
> btrfs_release_path(path);
> if (ret == 0) {
> - btrfs_inc_nlink(inode);
> + if (!inode->i_nlink)
> + set_nlink(inode, 1);
> + else
> + btrfs_inc_nlink(inode);
> ret = btrfs_update_inode(trans, root, inode);
> } else if (ret == -EEXIST) {
> ret = 0;
> --
> 1.7.7.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html