tree 60cc93e993e89b0c83a549bd65647879ce37d9cc
parent 03529d9f66b7995c67ddceb8f83258df3c9915da
parent 5493a0fcba8a94baa5c1d80aca21d6ae4b3b573e
author Linus Torvalds <torvalds@g5.osdl.org> 1151460556 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1151460556 -0700

Merge git://oss.sgi.com:8090/nathans/xfs-2.6

* git://oss.sgi.com:8090/nathans/xfs-2.6:
  [XFS] Fixup whitespace damage in log_write, remove final warning.
  [XFS] Rework code snippets slightly to remove remaining recent-gcc
  [XFS] Fix realtime subvolume expansion, a porting bug b0rked it.  Coverity
  [XFS] Remove a race condition where a linked inode could BUG_ON in
  [XFS] Remove redundant directory checks from inode link operation.
  [XFS] Remove a couple of no-longer-used macros.
  [XFS] Reduce size of xfs_trans_t structure. * remove ->t_forw, ->t_back --
  [XFS] remove unused behaviour lock - shrink XFS vnode as a side effect.
  [XFS] * There is trivial "inode => vnode => inode" conversion, but only
  [XFS] link(2) on directory is banned in VFS.