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

[cascardo/linux.git] / fs / orangefs / inode.c

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 2e63e6d..c83846f 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -129,8 +129,8 @@ static ssize_t orangefs_direct_IO(struct kiocb *iocb,
                                  struct iov_iter *iter)
 {
        gossip_debug(GOSSIP_INODE_DEBUG,
-                    "orangefs_direct_IO: %s\n",
-                    iocb->ki_filp->f_path.dentry->d_name.name);
+                    "orangefs_direct_IO: %pD\n",
+                    iocb->ki_filp);
 
        return -EINVAL;
 }
@@ -216,10 +216,10 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
        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;
 
@@ -259,10 +259,10 @@ int orangefs_getattr(struct vfsmount *mnt,
        struct orangefs_inode_s *orangefs_inode = NULL;
 
        gossip_debug(GOSSIP_INODE_DEBUG,
-                    "orangefs_getattr: called on %s\n",
-                    dentry->d_name.name);
+                    "orangefs_getattr: called on %pd\n",
+                    dentry);
 
-       ret = orangefs_inode_getattr(inode, 0, 1);
+       ret = orangefs_inode_getattr(inode, 0, 0);
        if (ret == 0) {
                generic_fillattr(inode, kstat);
 
@@ -384,7 +384,7 @@ struct inode *orangefs_iget(struct super_block *sb, struct orangefs_object_kref
        if (!inode || !(inode->i_state & I_NEW))
                return inode;
 
-       error = orangefs_inode_getattr(inode, 1, 0);
+       error = orangefs_inode_getattr(inode, 1, 1);
        if (error) {
                iget_failed(inode);
                return ERR_PTR(error);
@@ -429,7 +429,7 @@ struct inode *orangefs_new_inode(struct super_block *sb, struct inode *dir,
        orangefs_set_inode(inode, ref);
        inode->i_ino = hash;    /* needed for stat etc */
 
-       error = orangefs_inode_getattr(inode, 1, 0);
+       error = orangefs_inode_getattr(inode, 1, 1);
        if (error)
                goto out_iput;