From: Josef Bacik Date: Fri, 1 Mar 2013 18:35:47 +0000 (-0500) Subject: Btrfs: use set_nlink if our i_nlink is 0 X-Git-Tag: v3.9-rc2~3^2~2^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bf7a4890518186238d2579be16ecc5190a707c0;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Btrfs: use set_nlink if our i_nlink is 0 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 --- 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;