From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 8 Oct 2016 15:06:08 +0000 (-0400)
Subject: Merge remote-tracking branch 'jk/vfs' into work.misc
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=e55f1d1d13e7f1c364672d667d78fd1f640ab9f9;p=linux

Merge remote-tracking branch 'jk/vfs' into work.misc
---

e55f1d1d13e7f1c364672d667d78fd1f640ab9f9
diff --cc fs/orangefs/inode.c
index d4c6915f085b,cff00ebac03a..c83846fb9b14
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@@ -216,10 -216,10 +216,10 @@@ int orangefs_setattr(struct dentry *den
  	struct inode *inode = dentry->d_inode;
  
  	gossip_debug(GOSSIP_INODE_DEBUG,
 -		     "orangefs_setattr: called on %s\n",
 -		     dentry->d_name.name);
 +		     "orangefs_setattr: called on %pd\n",
 +		     dentry);
  
- 	ret = inode_change_ok(inode, iattr);
+ 	ret = setattr_prepare(dentry, iattr);
  	if (ret)
  		goto out;