diff options
Diffstat (limited to 'fs/ocfs2/quota_local.c')
| -rw-r--r-- | fs/ocfs2/quota_local.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index 3df2954ac83b..1a2c50a759fa 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c | |||
| @@ -108,7 +108,7 @@ static int ocfs2_modify_bh(struct inode *inode, struct buffer_head *bh, | |||
| 108 | mlog_errno(status); | 108 | mlog_errno(status); |
| 109 | return status; | 109 | return status; |
| 110 | } | 110 | } |
| 111 | status = ocfs2_journal_access_dq(handle, inode, bh, | 111 | status = ocfs2_journal_access_dq(handle, INODE_CACHE(inode), bh, |
| 112 | OCFS2_JOURNAL_ACCESS_WRITE); | 112 | OCFS2_JOURNAL_ACCESS_WRITE); |
| 113 | if (status < 0) { | 113 | if (status < 0) { |
| 114 | mlog_errno(status); | 114 | mlog_errno(status); |
| @@ -510,7 +510,8 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode, | |||
| 510 | goto out_commit; | 510 | goto out_commit; |
| 511 | } | 511 | } |
| 512 | /* Release local quota file entry */ | 512 | /* Release local quota file entry */ |
| 513 | status = ocfs2_journal_access_dq(handle, lqinode, | 513 | status = ocfs2_journal_access_dq(handle, |
| 514 | INODE_CACHE(lqinode), | ||
| 514 | qbh, OCFS2_JOURNAL_ACCESS_WRITE); | 515 | qbh, OCFS2_JOURNAL_ACCESS_WRITE); |
| 515 | if (status < 0) { | 516 | if (status < 0) { |
| 516 | mlog_errno(status); | 517 | mlog_errno(status); |
| @@ -619,7 +620,8 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb, | |||
| 619 | mlog_errno(status); | 620 | mlog_errno(status); |
| 620 | goto out_bh; | 621 | goto out_bh; |
| 621 | } | 622 | } |
| 622 | status = ocfs2_journal_access_dq(handle, lqinode, bh, | 623 | status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), |
| 624 | bh, | ||
| 623 | OCFS2_JOURNAL_ACCESS_WRITE); | 625 | OCFS2_JOURNAL_ACCESS_WRITE); |
| 624 | if (status < 0) { | 626 | if (status < 0) { |
| 625 | mlog_errno(status); | 627 | mlog_errno(status); |
| @@ -994,7 +996,7 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk( | |||
| 994 | } | 996 | } |
| 995 | dchunk = (struct ocfs2_local_disk_chunk *)bh->b_data; | 997 | dchunk = (struct ocfs2_local_disk_chunk *)bh->b_data; |
| 996 | ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), bh); | 998 | ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), bh); |
| 997 | status = ocfs2_journal_access_dq(handle, lqinode, bh, | 999 | status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), bh, |
| 998 | OCFS2_JOURNAL_ACCESS_CREATE); | 1000 | OCFS2_JOURNAL_ACCESS_CREATE); |
| 999 | if (status < 0) { | 1001 | if (status < 0) { |
| 1000 | mlog_errno(status); | 1002 | mlog_errno(status); |
| @@ -1028,7 +1030,7 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk( | |||
| 1028 | goto out_trans; | 1030 | goto out_trans; |
| 1029 | } | 1031 | } |
| 1030 | ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), dbh); | 1032 | ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), dbh); |
| 1031 | status = ocfs2_journal_access_dq(handle, lqinode, dbh, | 1033 | status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), dbh, |
| 1032 | OCFS2_JOURNAL_ACCESS_CREATE); | 1034 | OCFS2_JOURNAL_ACCESS_CREATE); |
| 1033 | if (status < 0) { | 1035 | if (status < 0) { |
| 1034 | mlog_errno(status); | 1036 | mlog_errno(status); |
| @@ -1143,7 +1145,7 @@ static struct ocfs2_quota_chunk *ocfs2_extend_local_quota_file( | |||
| 1143 | goto out; | 1145 | goto out; |
| 1144 | } | 1146 | } |
| 1145 | /* Zero created block */ | 1147 | /* Zero created block */ |
| 1146 | status = ocfs2_journal_access_dq(handle, lqinode, bh, | 1148 | status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), bh, |
| 1147 | OCFS2_JOURNAL_ACCESS_CREATE); | 1149 | OCFS2_JOURNAL_ACCESS_CREATE); |
| 1148 | if (status < 0) { | 1150 | if (status < 0) { |
| 1149 | mlog_errno(status); | 1151 | mlog_errno(status); |
| @@ -1158,7 +1160,8 @@ static struct ocfs2_quota_chunk *ocfs2_extend_local_quota_file( | |||
| 1158 | goto out_trans; | 1160 | goto out_trans; |
| 1159 | } | 1161 | } |
| 1160 | /* Update chunk header */ | 1162 | /* Update chunk header */ |
| 1161 | status = ocfs2_journal_access_dq(handle, lqinode, chunk->qc_headerbh, | 1163 | status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), |
| 1164 | chunk->qc_headerbh, | ||
| 1162 | OCFS2_JOURNAL_ACCESS_WRITE); | 1165 | OCFS2_JOURNAL_ACCESS_WRITE); |
| 1163 | if (status < 0) { | 1166 | if (status < 0) { |
| 1164 | mlog_errno(status); | 1167 | mlog_errno(status); |
| @@ -1292,7 +1295,8 @@ static int ocfs2_local_release_dquot(struct dquot *dquot) | |||
| 1292 | goto out; | 1295 | goto out; |
| 1293 | } | 1296 | } |
| 1294 | 1297 | ||
| 1295 | status = ocfs2_journal_access_dq(handle, sb_dqopt(sb)->files[type], | 1298 | status = ocfs2_journal_access_dq(handle, |
| 1299 | INODE_CACHE(sb_dqopt(sb)->files[type]), | ||
| 1296 | od->dq_chunk->qc_headerbh, OCFS2_JOURNAL_ACCESS_WRITE); | 1300 | od->dq_chunk->qc_headerbh, OCFS2_JOURNAL_ACCESS_WRITE); |
| 1297 | if (status < 0) { | 1301 | if (status < 0) { |
| 1298 | mlog_errno(status); | 1302 | mlog_errno(status); |