aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-03-03 09:05:06 -0500
committerJan Kara <jack@suse.cz>2010-03-04 18:20:30 -0500
commit907f4554e2521cb28b0009d17167760650a9561c (patch)
tree68dc49163fd34331f8efbd63592c8f1baa387031 /fs/ext4/inode.c
parent9f7547580263d4a55efe06ce5cfd567f568be6e8 (diff)
dquot: move dquot initialization responsibility into the filesystem
Currently various places in the VFS call vfs_dq_init directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the initialization. For most metadata operations this is a straight forward move into the methods, but for truncate and open it's a bit more complicated. For truncate we currently only call vfs_dq_init for the sys_truncate case because open already takes care of it for ftruncate and open(O_TRUNC) - the new code causes an additional vfs_dq_init for those which is harmless. For open the initialization is moved from do_filp_open into the open method, which means it happens slightly earlier now, and only for regular files. The latter is fine because we don't need to initialize it for operations on special files, and we already do it as part of the namespace operations for directories. Add a dquot_file_open helper that filesystems that support generic quotas can use to fill in ->open. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 6a002a6d0624..eaa22ae9f1f6 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -170,6 +170,9 @@ void ext4_delete_inode(struct inode *inode)
170 handle_t *handle; 170 handle_t *handle;
171 int err; 171 int err;
172 172
173 if (!is_bad_inode(inode))
174 vfs_dq_init(inode);
175
173 if (ext4_should_order_data(inode)) 176 if (ext4_should_order_data(inode))
174 ext4_begin_ordered_truncate(inode, 0); 177 ext4_begin_ordered_truncate(inode, 0);
175 truncate_inode_pages(&inode->i_data, 0); 178 truncate_inode_pages(&inode->i_data, 0);
@@ -5251,6 +5254,8 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
5251 if (error) 5254 if (error)
5252 return error; 5255 return error;
5253 5256
5257 if (ia_valid & ATTR_SIZE)
5258 vfs_dq_init(inode);
5254 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || 5259 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
5255 (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) { 5260 (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
5256 handle_t *handle; 5261 handle_t *handle;