Merge tag 'nfs-for-4.9-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

Pull NFS client bugfixes from Anna Schumaker:
 "Just two bugfixes this time:

  Stable bugfix:
   - Fix last_write_offset incorrectly set to page boundary

  Other bugfix:
   - Fix missing-braces warning"

* tag 'nfs-for-4.9-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  nfs4: fix missing-braces warning
  pnfs/blocklayout: fix last_write_offset incorrectly set to page boundary

diff --combined fs/nfs/nfs4proc.c
index ad917bd,45b38ee..7897826
--- 1/fs/nfs/nfs4proc.c
--- 2/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@@ -1545,7 -1545,7 +1545,7 @@@ static int update_open_stateid(struct n
        struct nfs_client *clp = server->nfs_client;
        struct nfs_inode *nfsi = NFS_I(state->inode);
        struct nfs_delegation *deleg_cur;
-       nfs4_stateid freeme = {0};
+       nfs4_stateid freeme = { };
        int ret = 0;
  
        fmode &= (FMODE_READ|FMODE_WRITE);
@@@ -9306,14 -9306,20 +9306,14 @@@ static const struct inode_operations nf
        .permission     = nfs_permission,
        .getattr        = nfs_getattr,
        .setattr        = nfs_setattr,
 -      .getxattr       = generic_getxattr,
 -      .setxattr       = generic_setxattr,
        .listxattr      = nfs4_listxattr,
 -      .removexattr    = generic_removexattr,
  };
  
  static const struct inode_operations nfs4_file_inode_operations = {
        .permission     = nfs_permission,
        .getattr        = nfs_getattr,
        .setattr        = nfs_setattr,
 -      .getxattr       = generic_getxattr,
 -      .setxattr       = generic_setxattr,
        .listxattr      = nfs4_listxattr,
 -      .removexattr    = generic_removexattr,
  };
  
  const struct nfs_rpc_ops nfs_v4_clientops = {