orangefs: let setattr write to cached inode

This is a fairly big change, but ultimately it's not a lot of code.

Implement write_inode and then avoid the call to orangefs_inode_setattr
within orangefs_setattr.

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 222ef7be0c7cc4d4162453ccdf7d029c47a755a8..2e630c1f7ae25f2d91882d718f851899bb984815 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -207,8 +207,8 @@ static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr)
  */
 int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
 {
-       int ret = -EINVAL;
        struct inode *inode = dentry->d_inode;
+       int ret;
 
        gossip_debug(GOSSIP_INODE_DEBUG,
                "%s: called on %pd\n",
@@ -228,16 +228,11 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
        setattr_copy(inode, iattr);
        mark_inode_dirty(inode);
 
-       ret = orangefs_inode_setattr(inode, iattr);
-       gossip_debug(GOSSIP_INODE_DEBUG,
-               "%s: orangefs_inode_setattr returned %d\n",
-               __func__,
-               ret);
-
-       if (!ret && (iattr->ia_valid & ATTR_MODE))
+       if (iattr->ia_valid & ATTR_MODE)
                /* change mod on a file that has ACLs */
                ret = posix_acl_chmod(inode, inode->i_mode);
 
+       ret = 0;
 out:
        gossip_debug(GOSSIP_INODE_DEBUG, "%s: ret:%d:\n", __func__, ret);
        return ret;

diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index ef3388c90ff7dd3f3edbd05c2d683e0ceffa8521..f27da3bbafac5810359f2a0b0bba200864238199 100644 (file)
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -152,6 +152,22 @@ static void orangefs_destroy_inode(struct inode *inode)
        call_rcu(&inode->i_rcu, orangefs_i_callback);
 }
 
+static int orangefs_write_inode(struct inode *inode,
+                               struct writeback_control *wbc)
+{
+       struct iattr iattr;
+       gossip_debug(GOSSIP_SUPER_DEBUG, "orangefs_write_inode\n");
+       iattr.ia_valid = ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_ATIME |
+           ATTR_ATIME_SET | ATTR_MTIME | ATTR_MTIME_SET | ATTR_CTIME;
+       iattr.ia_mode = inode->i_mode;
+       iattr.ia_uid = inode->i_uid;
+       iattr.ia_gid = inode->i_gid;
+       iattr.ia_atime = inode->i_atime;
+       iattr.ia_mtime = inode->i_mtime;
+       iattr.ia_ctime = inode->i_ctime;
+       return orangefs_inode_setattr(inode, &iattr);
+}
+
 /*
  * NOTE: information filled in here is typically reflected in the
  * output of the system command 'df'
@@ -310,6 +326,7 @@ void fsid_key_table_finalize(void)
 static const struct super_operations orangefs_s_ops = {
        .alloc_inode = orangefs_alloc_inode,
        .destroy_inode = orangefs_destroy_inode,
+       .write_inode = orangefs_write_inode,
        .drop_inode = generic_delete_inode,
        .statfs = orangefs_statfs,
        .remount_fs = orangefs_remount_fs,