From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Feb 2010 00:08:15 +0000 (-0800)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: firefly_0821_release~9833^2~3231
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a9861b50378ce29212ae2b39ee2d56b2058748cf;p=firefly-linux-kernel-4.4.55.git

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Don't clobber the attribute type in nfs_update_inode()
  NFS: Fix a umount race
  NFS: Fix an Oops when truncating a file
  NFS: Ensure that we handle NFS4ERR_STALE_STATEID correctly
  NFSv4.1: Don't call nfs4_schedule_state_recovery() unnecessarily
  NFSv4: Don't allow posix locking against servers that don't support it
  NFSv4: Ensure that the NFSv4 locking can recover from stateid errors
  NFS: Avoid warnings when CONFIG_NFS_V4=n
  NFS: Make nfs_commitdata_release static
  NFS: Try to commit unstable writes in nfs_release_page()
  NFS: Fix a reference leak in nfs_wb_cancel_page()
---

a9861b50378ce29212ae2b39ee2d56b2058748cf