aboutsummaryrefslogtreecommitdiffstats
path: root/fs/quota/dquot.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/quota/dquot.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/quota/dquot.c')
-rw-r--r--fs/quota/dquot.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index cd83c5b871ba..6244bca45c9d 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -1821,6 +1821,20 @@ const struct dquot_operations dquot_operations = {
1821}; 1821};
1822 1822
1823/* 1823/*
1824 * Generic helper for ->open on filesystems supporting disk quotas.
1825 */
1826int dquot_file_open(struct inode *inode, struct file *file)
1827{
1828 int error;
1829
1830 error = generic_file_open(inode, file);
1831 if (!error && (file->f_mode & FMODE_WRITE))
1832 vfs_dq_init(inode);
1833 return error;
1834}
1835EXPORT_SYMBOL(dquot_file_open);
1836
1837/*
1824 * Turn quota off on a device. type == -1 ==> quotaoff for all types (umount) 1838 * Turn quota off on a device. type == -1 ==> quotaoff for all types (umount)
1825 */ 1839 */
1826int vfs_quota_disable(struct super_block *sb, int type, unsigned int flags) 1840int vfs_quota_disable(struct super_block *sb, int type, unsigned int flags)