tree 5fce9d0ac131311b5d90a55d6132fbec6aa38dbe
parent d2c5f06e361f18be0d7b75988ce6a9e8800a8113
parent b7d8ac3e1779c30ddef0a8f38042076c5007a23d
author Linus Torvalds <torvalds@g5.osdl.org> 1161365294 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1161365294 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  [GFS2] gfs2_dir_read_data(): fix uninitialized variable usage
  [GFS2] fs/gfs2/ops_fstype.c:fill_super_meta(): fix NULL dereference
  [GFS2] fs/gfs2/dir.c:gfs2_dir_write_data(): don't use an uninitialized variable
  [GFS2] fs/gfs2/ops_fstype.c:gfs2_get_sb_meta(): remove unused variable
  [GFS2] fs/gfs2/dir.c:gfs2_dir_write_data(): remove dead code
  [GFS2] gfs2 endianness bug: be16 assigned to be32 field
  [GFS2] Fix bmap to map extents properly
  [DLM] fix iovec length in recvmsg