Despite it's 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: Christoph Hellwig <hch@xxxxxx>
Index: linux-2.6/fs/attr.c
===================================================================
--- linux-2.6.orig/fs/attr.c 2010-05-31 10:16:11.000000000 +0200
+++ linux-2.6/fs/attr.c 2010-05-31 10:17:30.331254661 +0200
@@ -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
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, c
return error;
}
- generic_setattr(inode, attr);
+ setattr_copy(inode, attr);
mark_inode_dirty(inode);
Index: linux-2.6/fs/ext2/inode.c
===================================================================
--- linux-2.6.orig/fs/ext2/inode.c 2010-05-31 10:16:08.000000000 +0200
+++ linux-2.6/fs/ext2/inode.c 2010-05-31 10:17:30.332254940 +0200
@@ -1544,7 +1544,7 @@ int ext2_setattr(struct dentry *dentry,
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);
Index: linux-2.6/fs/fat/file.c
===================================================================
--- linux-2.6.orig/fs/fat/file.c 2010-05-31 10:15:57.000000000 +0200
+++ linux-2.6/fs/fat/file.c 2010-05-31 10:17:30.345254940 +0200
@@ -446,7 +446,7 @@ int fat_setattr(struct dentry *dentry, s
goto out;
}
- generic_setattr(inode, attr);
+ setattr_copy(inode, attr);
mark_inode_dirty(inode);
out:
return error;
Index: linux-2.6/fs/libfs.c
===================================================================
--- linux-2.6.orig/fs/libfs.c 2010-05-31 10:16:11.000000000 +0200
+++ linux-2.6/fs/libfs.c 2010-05-31 10:18:04.781254519 +0200
@@ -395,8 +395,7 @@ int simple_setattr(struct dentry *dentry
return error;
}
- generic_setattr(inode, iattr);
-
+ setattr_copy(inode, iattr);
return error;
}
EXPORT_SYMBOL(simple_setattr);
Index: linux-2.6/fs/ramfs/file-nommu.c
===================================================================
--- linux-2.6.orig/fs/ramfs/file-nommu.c 2010-05-31 10:15:57.000000000 +0200
+++ linux-2.6/fs/ramfs/file-nommu.c 2010-05-31 10:17:30.353254032 +0200
@@ -183,7 +183,7 @@ static int ramfs_nommu_setattr(struct de
}
}
- generic_setattr(inode, ia);
+ setattr_copy(inode, ia);
out:
ia->ia_valid = old_ia_valid;
return ret;
Index: linux-2.6/fs/sysfs/inode.c
===================================================================
--- linux-2.6.orig/fs/sysfs/inode.c 2010-05-31 10:15:57.000000000 +0200
+++ linux-2.6/fs/sysfs/inode.c 2010-05-31 10:17:30.358254172 +0200
@@ -118,7 +118,7 @@ int sysfs_setattr(struct dentry *dentry,
goto out;
/* this ignores size changes */
- generic_setattr(inode, iattr);
+ setattr_copy(inode, iattr);
error = sysfs_sd_setattr(sd, iattr);
Index: linux-2.6/include/linux/fs.h
===================================================================
--- linux-2.6.orig/include/linux/fs.h 2010-05-31 10:15:57.000000000 +0200
+++ linux-2.6/include/linux/fs.h 2010-05-31 10:17:30.363254032 +0200
@@ -2379,7 +2379,7 @@ extern int buffer_migrate_page(struct ad
extern int inode_change_ok(const struct inode *, struct iattr *);
extern int inode_newsize_ok(const struct inode *, loff_t offset);
extern int __must_check inode_setattr(struct inode *, const struct iattr *);
-extern void generic_setattr(struct inode *inode, const struct iattr *attr);
+extern void setattr_copy(struct inode *inode, const struct iattr *attr);
extern void file_update_time(struct file *file);
Index: linux-2.6/mm/shmem.c
===================================================================
--- linux-2.6.orig/mm/shmem.c 2010-05-31 10:15:57.000000000 +0200
+++ linux-2.6/mm/shmem.c 2010-05-31 10:17:30.368253403 +0200
@@ -810,7 +810,7 @@ static int shmem_notify_change(struct de
error = inode_change_ok(inode, attr);
if (!error)
- generic_setattr(inode, attr);
+ setattr_copy(inode, attr);
#ifdef CONFIG_TMPFS_POSIX_ACL
if (!error && (attr->ia_valid & ATTR_MODE))
error = generic_acl_chmod(inode);
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
