Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a1a90ad authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

rename generic_setattr 



Despite its name it's now a generic implementation of ->setattr, but
rather a helper to copy attributes from a struct iattr to the inode.
Rename it to setattr_copy to reflect this fact.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d39aae9e

fs/attr.c

+7 −7
Original line number Diff line number Diff line
@@ -105,13 +105,13 @@ out_big: 
EXPORT_SYMBOL(inode_newsize_ok);



/**

 * generic_setattr - copy simple metadata updates into the generic inode

 * setattr_copy - copy simple metadata updates into the generic inode

 * @inode:	the inode to be updated

 * @attr:	the new attributes

 *

 * generic_setattr must be called with i_mutex held.

 * setattr_copy must be called with i_mutex held.

 *

 * generic_setattr updates the inode's metadata with that specified

 * setattr_copy updates the inode's metadata with that specified

 * in attr. Noticably missing is inode size update, which is more complex

 * as it requires pagecache updates. See simple_setsize.

 *
@@ -119,7 +119,7 @@ EXPORT_SYMBOL(inode_newsize_ok); 
 * that for "simple" filesystems, the struct inode is the inode storage.

 * The caller is free to mark the inode dirty afterwards if needed.

 */

void generic_setattr(struct inode *inode, const struct iattr *attr)

void setattr_copy(struct inode *inode, const struct iattr *attr)

{

	unsigned int ia_valid = attr->ia_valid;
@@ -144,11 +144,11 @@ void generic_setattr(struct inode *inode, const struct iattr *attr) 
		inode->i_mode = mode;

	}

}

EXPORT_SYMBOL(generic_setattr);

EXPORT_SYMBOL(setattr_copy);



/*

 * note this function is deprecated, the new truncate sequence should be

 * used instead -- see eg. simple_setsize, generic_setattr.

 * used instead -- see eg. simple_setsize, setattr_copy.

 */

int inode_setattr(struct inode *inode, const struct iattr *attr)

{
@@ -163,7 +163,7 @@ int inode_setattr(struct inode *inode, const struct iattr *attr) 
			return error;

	}



	generic_setattr(inode, attr);

	setattr_copy(inode, attr);



	mark_inode_dirty(inode);

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr) 
		if (error)

			return error;

	}

	generic_setattr(inode, iattr);

	setattr_copy(inode, iattr);

	if (iattr->ia_valid & ATTR_MODE)

		error = ext2_acl_chmod(inode);

	mark_inode_dirty(inode);

fs/fat/file.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr) 
			goto out;

	}



	generic_setattr(inode, attr);

	setattr_copy(inode, attr);

	mark_inode_dirty(inode);

out:

	return error;

fs/libfs.c

+1 −2
Original line number Diff line number Diff line
@@ -395,8 +395,7 @@ int simple_setattr(struct dentry *dentry, struct iattr *iattr) 
			return error;

	}



	generic_setattr(inode, iattr);



	setattr_copy(inode, iattr);

	return error;

}

EXPORT_SYMBOL(simple_setattr);

fs/ramfs/file-nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int ramfs_nommu_setattr(struct dentry *dentry, struct iattr *ia) 
		}

	}



	generic_setattr(inode, ia);

	setattr_copy(inode, ia);

 out:

	ia->ia_valid = old_ia_valid;

	return ret;