From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Jan 2017 20:15:59 +0000 (-0800)
Subject: Merge tag 'nfs-for-4.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v4.10-rc5~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5cf7a0f3442b2312326c39f571d637669a478235;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'nfs-for-4.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes from Trond Myklebust:

 - fix invalid fget()/fput() calls when doing file locking

 - fix multiple directory cache invalidation issues due to the client
   failing to recognise that the directory wasn't changed

 - fix client recovery when server reboots multiple times

* tag 'nfs-for-4.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Fix client recovery when server reboots multiple times
  NFSv4: update_changeattr should update the attribute timestamp
  NFSv4: Don't call update_changeattr() unless the unlink is successful
  NFSv4: Don't apply change_info4 twice on rename within a directory
  NFSv4: Call update_changeattr() from _nfs4_proc_open only if a file was created
  nfs: Don't take a reference on fl->fl_file for LOCK operation
---

5cf7a0f3442b2312326c39f571d637669a478235