diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-05 09:06:28 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-05 09:06:28 +0900 |
| commit | 6f66f9005b66a9a09028f8c85d67600b20a979ec (patch) | |
| tree | 8d805ed204c8beba4ca01449a651b871234084c2 /arch/x86/kvm/lapic.c | |
| parent | 8764d86100fe58e69877753faa44fc1d9276c624 (diff) | |
| parent | a6a4d98b0124b5d3befe8b3a99f51f1b4fcc6dcf (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull gfs2 fixes from Steven Whitehouse:
"There are four patches this time.
The first fixes a problem where the wrong descriptor type was being
written into the log for journaled data blocks.
The second fixes a race relating to the deallocation of allocator
data.
The third provides a fallback if kmalloc is unable to satisfy a
request to allocate a directory hash table.
The fourth fixes the iopen glock caching so that inodes are deleted in
a more timely manner after rmdir/unlink"
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
GFS2: Don't cache iopen glocks
GFS2: Fall back to vmalloc if kmalloc fails for dir hash tables
GFS2: Increase i_writecount during gfs2_setattr_size
GFS2: Set log descriptor type for jdata blocks
Diffstat (limited to 'arch/x86/kvm/lapic.c')
0 files changed, 0 insertions, 0 deletions