Skip to contentSkip to conversation

Btrfs fixes

GIT PULL Chris Mason 1 participant 1 message Dec 23, 2011 Btrfs file system

lore
Share & tools
lore
#0 lore raw

Hi Linus,

My for-linus branch has two commits:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus

One is Al's patch in response to my last pull request, but with one small change to call d_instantiate before trying to log the inode in btrfs_link.

The other is a double unlock that Dan Carpenter found. These did get rebased this morning before I pushed them out, but I reran tests after the rebase.

Chris Mason (1) commits (+2/-1):
Btrfs: fix worker lock misuse in find_worker

Al Viro (1) commits (+5/-4):
Btrfs: call d_instantiate after all ops are setup

Total: (2) commits (+7/-5)

 fs/btrfs/async-thread.c |    3 ++-
 fs/btrfs/inode.c        |    9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)