diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-03-06 19:46:29 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-03-06 19:46:29 -0500 |
| commit | 2cc65e3e57d636a159d92945655b1574e47dba63 (patch) | |
| tree | a86ebdd6cb7c7cfbf1d4a547df6254a1a9849ff1 /fs/btrfs/tree-log.c | |
| parent | 154ea2893002618bc3f9a1e2d8186c65490968b1 (diff) | |
| parent | 9b53157aac7366cea413ee29b629f83225829e87 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | 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 c7ef569eb22a..451fad96ecd1 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; |