---

yaml
---
r: 9983
b: refs/heads/master
c: 642ac54
h: refs/heads/master
i:
  9981: 0f0d78f
  9979: e2c10d0
  9975: 4f7179d
  9967: f4a003c
  9951: e289e7d
  9919: f02f237
  9855: 14e2bbf
  9727: 9fd6963
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cae7a073a4c5484cc5713eab606bf54b46724ab3
+refs/heads/master: 642ac54923e0291ae2c8e42edde18d8c9c0a3c84

trunk/fs/nfs/inode.c

@@ -853,6 +853,11 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
 			filemap_fdatawait(inode->i_mapping);
 		nfs_wb_all(inode);
 	}
+	/*
+	 * Return any delegations if we're going to change ACLs
+	 */
+	if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0)
+		nfs_inode_return_delegation(inode);
 	error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr);
 	if (error == 0)
 		nfs_refresh_inode(inode, &fattr);

trunk/fs/nfs/nfs4proc.c

@@ -2405,6 +2405,7 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen
 
 	if (!nfs4_server_supports_acls(server))
 		return -EOPNOTSUPP;
+	nfs_inode_return_delegation(inode);
 	buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
 	ret = rpc_call_sync(NFS_SERVER(inode)->client, &msg, 0);
 	if (ret == 0)