diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-03 20:38:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-03 20:38:14 +0100 |
commit | ed4e6a94d3053b9900b4a1338b8056d532a564c4 (patch) | |
tree | 89b4183298e7ae08ec531652529bbd73076ceda7 /net/rds/tcp_stats.c | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
parent | GFS2: Reset rd_last_alloc when it reaches the end of the rgrp (diff) | |
download | linux-ed4e6a94d3053b9900b4a1338b8056d532a564c4.tar.xz linux-ed4e6a94d3053b9900b4a1338b8056d532a564c4.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull GFS2 fixes from Steven Whitehouse:
"Here are four small bug fixes for GFS2. There is no common theme here
really, just a few items that were fixed recently.
The first fixes lock name generation when the glock number is 0. The
second fixes a race allocating reservation structures and the final
two fix a performance issue by making small changes in the allocation
code."
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
GFS2: Reset rd_last_alloc when it reaches the end of the rgrp
GFS2: Stop looking for free blocks at end of rgrp
GFS2: Fix race in gfs2_rs_alloc
GFS2: Initialize hex string to '0'
Diffstat (limited to 'net/rds/tcp_stats.c')
0 files changed, 0 insertions, 0 deletions