• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 1b21f458
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (57 commits)
      [GFS2] Accept old format NFS filehandles
      [GFS2] Small fixes to logging code
      [DLM] dump more lock values
      [GFS2] Remove i_mode passing from NFS File Handle
      [GFS2] Obtaining no_formal_ino from directory entry
      [GFS2] git-gfs2-nmw-build-fix
      [GFS2] System won't suspend with GFS2 file system mounted
      [GFS2] remounting w/o acl option leaves acls enabled
      [GFS2] inode size inconsistency
      [DLM] Telnet to port 21064 can stop all lockspaces
      [GFS2] Fix gfs2_block_truncate_page err return
      [GFS2] Addendum to the journaled file/unmount patch
      [GFS2] Simplify multiple glock aquisition
      [GFS2] assertion failure after writing to journaled file, umount
      [GFS2] Use zero_user_page() in stuffed_readpage()
      [GFS2] Remove bogus '\0' in rgrp.c
      [GFS2] Journaled file write/unstuff bug
      [DLM] don't require FS flag on all nodes
      [GFS2] Fix deallocation issues
      [GFS2] return conflicts for GETLK
      ...
    1b21f458
ops_file.c 15.3 KB