diff options
| author |   Jan Kara <jack@suse.cz> | 2010-05-13 18:05:15 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-05-21 19:30:48 +0200 |
| commit | 741e128933448e589a85286e535078b24f4cf568 (patch) | |
| tree | 40a069e5c7484673529f0747a9995cc7d2a85f00 /fs/ocfs2/quota_local.c | |
| parent | ocfs2: Fix estimate of credits needed for quota allocation (diff) | |
| download | linux-dev-741e128933448e589a85286e535078b24f4cf568.tar.xz linux-dev-741e128933448e589a85286e535078b24f4cf568.zip | |
ocfs2: Fix NULL pointer deref when writing local dquot
commit_dqblk() can write quota info to global file. That is actually a bad
thing to do because if we are just modifying local quota file, we are not
prepared (do not hold proper locks, do not have transaction credits) to do
a modification of the global quota file. So do not use commit_dqblk() and
instead call our writing function directly.
Acked-by: Joel Becker <Joel.Becker@oracle.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to '')
| -rw-r--r-- | fs/ocfs2/quota_local.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index 778947f0e951..551a6bff9f2c 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c @@ -892,7 +892,7 @@ static void olq_set_dquot(struct buffer_head *bh, void *private) } /* Write dquot to local quota file */ -static int ocfs2_local_write_dquot(struct dquot *dquot) +int ocfs2_local_write_dquot(struct dquot *dquot) { struct super_block *sb = dquot->dq_sb; struct ocfs2_dquot *od = OCFS2_DQUOT(dquot); @@ -1309,7 +1309,6 @@ static const struct quota_format_ops ocfs2_format_ops = { .read_file_info = ocfs2_local_read_info, .write_file_info = ocfs2_global_write_info, .free_file_info = ocfs2_local_free_info, - .commit_dqblk = ocfs2_local_write_dquot, }; struct quota_format_type ocfs2_quota_format = { |