diff options
| author | Jan Kara <jack@suse.cz> | 2009-01-12 23:20:32 +0100 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-02-02 14:20:17 -0800 |
| commit | f8afead7169f0f28a4b421bcbdb510e52a2d094d (patch) | |
| tree | 83245132376808a9a03868b6beb28d66e1f2a8fa /fs | |
| parent | ea455f8ab68338ba69f5d3362b342c115bea8e13 (diff) | |
| download | linux-3.10-f8afead7169f0f28a4b421bcbdb510e52a2d094d.tar.gz linux-3.10-f8afead7169f0f28a4b421bcbdb510e52a2d094d.tar.bz2 linux-3.10-f8afead7169f0f28a4b421bcbdb510e52a2d094d.zip | |
ocfs2: Fix possible deadlock in ocfs2_write_dquot()
It could happen that some limit has been set via quotactl() and in parallel
->mark_dirty() is called from another thread doing e.g. dquot_alloc_space(). In
such case ocfs2_write_dquot() must not try to sync the dquot because that needs
global quota lock but that ranks above transaction start.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/quota_global.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c index f4efa89baee..1ed0f7c8686 100644 --- a/fs/ocfs2/quota_global.c +++ b/fs/ocfs2/quota_global.c @@ -754,7 +754,9 @@ static int ocfs2_mark_dquot_dirty(struct dquot *dquot) if (dquot->dq_flags & mask) sync = 1; spin_unlock(&dq_data_lock); - if (!sync) { + /* This is a slight hack but we can't afford getting global quota + * lock if we already have a transaction started. */ + if (!sync || journal_current_handle()) { status = ocfs2_write_dquot(dquot); goto out; } |