Commit df2d7337 authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

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: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent f2d34c73

fs/orangefs/inode.c

+3 −8
Original line number Diff line number Diff line
@@ -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;

fs/orangefs/super.c

+17 −0
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE