diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 09:16:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 09:16:51 -0700 |
| commit | 6c337ad6cccf3365c89152896217be9d953121c6 (patch) | |
| tree | 9f679575b0025c9b279d733f77982cc4cb74b8ed /fs/nilfs2/segbuf.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (diff) | |
| parent | GFS2: dirty inode correctly in gfs2_write_end (diff) | |
| download | linux-dev-6c337ad6cccf3365c89152896217be9d953121c6.tar.xz linux-dev-6c337ad6cccf3365c89152896217be9d953121c6.zip | |
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
Pull GFS2 updates from Steven Whitehouse:
"This is possibly the smallest ever set of GFS2 patches for a merge
window. Also, most of them are bug fixes this time.
Two of my three patches (moving gfs2_sync_meta and merging the two
writepage implementations) are clean ups with the third (taking the
glock ref in examine_bucket) being a fix for a difficult to hit race
condition.
The removal of an unused memory barrier is a clean up from Bob
Peterson, and the "spectator" relates to a rarely used mount option.
Ben Marzinski's patch fixes a corner case where the incorrect inode
flags were being set, resulting in incorrect behaviour on fsync"
* tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
GFS2: dirty inode correctly in gfs2_write_end
GFS2: Don't flag consistency error if first mounter is a spectator
GFS2: Remove unnecessary memory barrier
GFS2: Merge ordered and writeback writepage
GFS2: Take glock reference in examine_bucket()
GFS2: Move gfs2_sync_meta to lops.c
Diffstat (limited to 'fs/nilfs2/segbuf.c')
0 files changed, 0 insertions, 0 deletions