diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-03-03 09:05:07 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-03-04 18:20:30 -0500 |
commit | 871a293155a24554e153538d36e3a80fa169aefb (patch) | |
tree | 7e38f5a2f9e87f63cbc4bc1077a4bb49dde441b0 /fs/ext3/super.c | |
parent | 907f4554e2521cb28b0009d17167760650a9561c (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/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 0163d0dae124..e844accbf55d 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -752,7 +752,6 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type, | |||
752 | const char *data, size_t len, loff_t off); | 752 | const char *data, size_t len, loff_t off); |
753 | 753 | ||
754 | static const struct dquot_operations ext3_quota_operations = { | 754 | static const struct dquot_operations ext3_quota_operations = { |
755 | .initialize = dquot_initialize, | ||
756 | .write_dquot = ext3_write_dquot, | 755 | .write_dquot = ext3_write_dquot, |
757 | .acquire_dquot = ext3_acquire_dquot, | 756 | .acquire_dquot = ext3_acquire_dquot, |
758 | .release_dquot = ext3_release_dquot, | 757 | .release_dquot = ext3_release_dquot, |
@@ -1480,7 +1479,7 @@ static void ext3_orphan_cleanup (struct super_block * sb, | |||
1480 | } | 1479 | } |
1481 | 1480 | ||
1482 | list_add(&EXT3_I(inode)->i_orphan, &EXT3_SB(sb)->s_orphan); | 1481 | list_add(&EXT3_I(inode)->i_orphan, &EXT3_SB(sb)->s_orphan); |
1483 | vfs_dq_init(inode); | 1482 | dquot_initialize(inode); |
1484 | if (inode->i_nlink) { | 1483 | if (inode->i_nlink) { |
1485 | printk(KERN_DEBUG | 1484 | printk(KERN_DEBUG |
1486 | "%s: truncating inode %lu to %Ld bytes\n", | 1485 | "%s: truncating inode %lu to %Ld bytes\n", |
@@ -2736,7 +2735,7 @@ static int ext3_statfs (struct dentry * dentry, struct kstatfs * buf) | |||
2736 | * Process 1 Process 2 | 2735 | * Process 1 Process 2 |
2737 | * ext3_create() quota_sync() | 2736 | * ext3_create() quota_sync() |
2738 | * journal_start() write_dquot() | 2737 | * journal_start() write_dquot() |
2739 | * vfs_dq_init() down(dqio_mutex) | 2738 | * dquot_initialize() down(dqio_mutex) |
2740 | * down(dqio_mutex) journal_start() | 2739 | * down(dqio_mutex) journal_start() |
2741 | * | 2740 | * |
2742 | */ | 2741 | */ |