Revert "ocfs2: cancel dqi_sync_work before freeing oinfo"
This reverts commit 687a6ab8c4
.
This commit is contained in:
parent
947732bc18
commit
c5c1ab676d
1 changed files with 2 additions and 6 deletions
|
@ -689,7 +689,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
|
|||
int status;
|
||||
struct buffer_head *bh = NULL;
|
||||
struct ocfs2_quota_recovery *rec;
|
||||
int locked = 0, global_read = 0;
|
||||
int locked = 0;
|
||||
|
||||
info->dqi_max_spc_limit = 0x7fffffffffffffffLL;
|
||||
info->dqi_max_ino_limit = 0x7fffffffffffffffLL;
|
||||
|
@ -697,7 +697,6 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
|
|||
if (!oinfo) {
|
||||
mlog(ML_ERROR, "failed to allocate memory for ocfs2 quota"
|
||||
" info.");
|
||||
status = -ENOMEM;
|
||||
goto out_err;
|
||||
}
|
||||
info->dqi_priv = oinfo;
|
||||
|
@ -710,7 +709,6 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
|
|||
status = ocfs2_global_read_info(sb, type);
|
||||
if (status < 0)
|
||||
goto out_err;
|
||||
global_read = 1;
|
||||
|
||||
status = ocfs2_inode_lock(lqinode, &oinfo->dqi_lqi_bh, 1);
|
||||
if (status < 0) {
|
||||
|
@ -781,12 +779,10 @@ out_err:
|
|||
if (locked)
|
||||
ocfs2_inode_unlock(lqinode, 1);
|
||||
ocfs2_release_local_quota_bitmaps(&oinfo->dqi_chunk);
|
||||
if (global_read)
|
||||
cancel_delayed_work_sync(&oinfo->dqi_sync_work);
|
||||
kfree(oinfo);
|
||||
}
|
||||
brelse(bh);
|
||||
return status;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Write local info to quota file */
|
||||
|
|
Loading…
Add table
Reference in a new issue