| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 23 Dec 2011 22:58:39 +0000 (14:58 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 23 Dec 2011 22:58:39 +0000 (14:58 -0800) | ||
| commit | 827fa4c762fa81fbfcd262505588feeeae7a3b66 | |
| tree | 1dbbfcfb0e3a6e6a453f630bfa008fba6bf78daf | tree | snapshot (tar.xz tar.gz zip) |
| parent | 5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f | commit | diff |
| parent | 08c422c27f855d27b0b3d9fa30ebd938d4ae6f1f | commit | diff |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: call d_instantiate after all ops are setup
Btrfs: fix worker lock misuse in find_worker
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: call d_instantiate after all ops are setup
Btrfs: fix worker lock misuse in find_worker
| fs/btrfs/inode.c | diff1 | | diff2 | | blob | history |