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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/attr.c b/fs/attr.c
index b4fa3b0aa59691ac4ca33d30e9afc308d5df98bd..1f6a895e24e9f641cb41343918e67bd794fadff6 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -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);
 

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 74dfe5f73330e45ea591b92425bc7e77b99def69..7dee7b3f3688f44211ce6e7da920e962e207c6af 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -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);

diff --git a/fs/fat/file.c b/fs/fat/file.c
index 990dfae022e5f8d1996588be029c12aa33b62f8f..20813d2c7d61d79ae128a33aa034280ef54dc61a 100644 (file)
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -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;

diff --git a/fs/libfs.c b/fs/libfs.c
index dcaf972cbf1b6d81f29e17d2a1fccd259a794777..861a88797716071efa859b2de01a2b798a1ab3bb 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -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);

diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index d532c20fc1796acb171fe22828f9fec935f53420..8d44f0347b27ec6c56a1cccef73c12876fed69ff 100644 (file)
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -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;

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 0835a3b70e03b01738a8ef18493e1c6180432acd..7e187fbd3d473d98167ffcf4b4179122c8cceeac 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -122,7 +122,7 @@ int sysfs_setattr(struct dentry *dentry, struct iattr *iattr)
                goto out;
 
        /* this ignores size changes */
-       generic_setattr(inode, iattr);
+       setattr_copy(inode, iattr);
 
 out:
        mutex_unlock(&sysfs_mutex);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b347b2d5666fef44012d4aaa6d23eb44fc85354d..8ebb5f01a4181144bd23d66e65b1537137ce33b4 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2393,7 +2393,7 @@ extern int buffer_migrate_page(struct address_space *,
 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);
 

diff --git a/mm/shmem.c b/mm/shmem.c
index f65f84062db554ed2b3e9452cc787f8ab4f1b0d3..3b58ad65d26cb3b4711eb4616335027b40a141ee 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -811,7 +811,7 @@ static int shmem_notify_change(struct dentry *dentry, struct iattr *attr)
 
        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);