From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Feb 2018 23:18:32 +0000 (-0800)
Subject: Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f1517df8701c9f12dae9ce7f43a5d300a6917619;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux

Pull nfsd update from Bruce Fields:
 "A fairly small update this time around. Some cleanup, RDMA fixes,
  overlayfs fixes, and a fix for an NFSv4 state bug.

  The bigger deal for nfsd this time around was Jeff Layton's
  already-merged i_version patches"

* tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux:
  svcrdma: Fix Read chunk round-up
  NFSD: hide unused svcxdr_dupstr()
  nfsd: store stat times in fill_pre_wcc() instead of inode times
  nfsd: encode stat->mtime for getattr instead of inode->i_mtime
  nfsd: return RESOURCE not GARBAGE_ARGS on too many ops
  nfsd4: don't set lock stateid's sc_type to CLOSED
  nfsd: Detect unhashed stids in nfsd4_verify_open_stid()
  sunrpc: remove dead code in svc_sock_setbufsize
  svcrdma: Post Receives in the Receive completion handler
  nfsd4: permit layoutget of executable-only files
  lockd: convert nlm_rqst.a_count from atomic_t to refcount_t
  lockd: convert nlm_lockowner.count from atomic_t to refcount_t
  lockd: convert nsm_handle.sm_count from atomic_t to refcount_t
---

f1517df8701c9f12dae9ce7f43a5d300a6917619
diff --cc fs/nfsd/nfsfh.h
index b8444189223b,99be87b50ebe..755e256a9103
--- a/fs/nfsd/nfsfh.h
+++ b/fs/nfsd/nfsfh.h
@@@ -257,10 -257,10 +258,10 @@@ static inline u64 nfsd4_change_attribut
  {
  	u64 chattr;
  
- 	chattr =  inode->i_ctime.tv_sec;
+ 	chattr =  stat->ctime.tv_sec;
  	chattr <<= 30;
- 	chattr += inode->i_ctime.tv_nsec;
+ 	chattr += stat->ctime.tv_nsec;
 -	chattr += inode->i_version;
 +	chattr += inode_query_iversion(inode);
  	return chattr;
  }