aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/inode.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-03-03 09:05:07 -0500
committerJan Kara <jack@suse.cz>2010-03-04 18:20:30 -0500
commit871a293155a24554e153538d36e3a80fa169aefb (patch)
tree7e38f5a2f9e87f63cbc4bc1077a4bb49dde441b0 /fs/ext2/inode.c
parent907f4554e2521cb28b0009d17167760650a9561c (diff)
dquot: cleanup dquot initialize routine
Get rid of the initialize dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_initialize helper to __dquot_initialize and vfs_dq_init to dquot_initialize to have a consistent namespace. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2/inode.c')
-rw-r--r--fs/ext2/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index c87840c33e17..45ff49f0a4b5 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -59,7 +59,7 @@ static inline int ext2_inode_is_fast_symlink(struct inode *inode)
59void ext2_delete_inode (struct inode * inode) 59void ext2_delete_inode (struct inode * inode)
60{ 60{
61 if (!is_bad_inode(inode)) 61 if (!is_bad_inode(inode))
62 vfs_dq_init(inode); 62 dquot_initialize(inode);
63 truncate_inode_pages(&inode->i_data, 0); 63 truncate_inode_pages(&inode->i_data, 0);
64 64
65 if (is_bad_inode(inode)) 65 if (is_bad_inode(inode))
@@ -1461,7 +1461,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
1461 return error; 1461 return error;
1462 1462
1463 if (iattr->ia_valid & ATTR_SIZE) 1463 if (iattr->ia_valid & ATTR_SIZE)
1464 vfs_dq_init(inode); 1464 dquot_initialize(inode);
1465 if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) || 1465 if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
1466 (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) { 1466 (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
1467 error = dquot_transfer(inode, iattr); 1467 error = dquot_transfer(inode, iattr);