.. | .. |
---|
7 | 7 | |
---|
8 | 8 | #include <trace/events/ext4.h> |
---|
9 | 9 | |
---|
| 10 | +int ext4_inode_journal_mode(struct inode *inode) |
---|
| 11 | +{ |
---|
| 12 | + if (EXT4_JOURNAL(inode) == NULL) |
---|
| 13 | + return EXT4_INODE_WRITEBACK_DATA_MODE; /* writeback */ |
---|
| 14 | + /* We do not support data journalling with delayed allocation */ |
---|
| 15 | + if (!S_ISREG(inode->i_mode) || |
---|
| 16 | + ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE) || |
---|
| 17 | + test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA || |
---|
| 18 | + (ext4_test_inode_flag(inode, EXT4_INODE_JOURNAL_DATA) && |
---|
| 19 | + !test_opt(inode->i_sb, DELALLOC))) { |
---|
| 20 | + /* We do not support data journalling for encrypted data */ |
---|
| 21 | + if (S_ISREG(inode->i_mode) && IS_ENCRYPTED(inode)) |
---|
| 22 | + return EXT4_INODE_ORDERED_DATA_MODE; /* ordered */ |
---|
| 23 | + return EXT4_INODE_JOURNAL_DATA_MODE; /* journal data */ |
---|
| 24 | + } |
---|
| 25 | + if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA) |
---|
| 26 | + return EXT4_INODE_ORDERED_DATA_MODE; /* ordered */ |
---|
| 27 | + if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA) |
---|
| 28 | + return EXT4_INODE_WRITEBACK_DATA_MODE; /* writeback */ |
---|
| 29 | + BUG(); |
---|
| 30 | +} |
---|
| 31 | + |
---|
10 | 32 | /* Just increment the non-pointer handle value */ |
---|
11 | 33 | static handle_t *ext4_get_nojournal(void) |
---|
12 | 34 | { |
---|
.. | .. |
---|
58 | 80 | * take the FS itself readonly cleanly. |
---|
59 | 81 | */ |
---|
60 | 82 | if (journal && is_journal_aborted(journal)) { |
---|
61 | | - ext4_abort(sb, "Detected aborted journal"); |
---|
| 83 | + ext4_abort(sb, -journal->j_errno, "Detected aborted journal"); |
---|
62 | 84 | return -EROFS; |
---|
63 | 85 | } |
---|
64 | 86 | return 0; |
---|
65 | 87 | } |
---|
66 | 88 | |
---|
67 | 89 | handle_t *__ext4_journal_start_sb(struct super_block *sb, unsigned int line, |
---|
68 | | - int type, int blocks, int rsv_blocks) |
---|
| 90 | + int type, int blocks, int rsv_blocks, |
---|
| 91 | + int revoke_creds) |
---|
69 | 92 | { |
---|
70 | 93 | journal_t *journal; |
---|
71 | 94 | int err; |
---|
72 | 95 | |
---|
73 | | - trace_ext4_journal_start(sb, blocks, rsv_blocks, _RET_IP_); |
---|
| 96 | + trace_ext4_journal_start(sb, blocks, rsv_blocks, revoke_creds, |
---|
| 97 | + _RET_IP_); |
---|
74 | 98 | err = ext4_journal_check_start(sb); |
---|
75 | 99 | if (err < 0) |
---|
76 | 100 | return ERR_PTR(err); |
---|
77 | 101 | |
---|
78 | 102 | journal = EXT4_SB(sb)->s_journal; |
---|
79 | | - if (!journal) |
---|
| 103 | + if (!journal || (EXT4_SB(sb)->s_mount_state & EXT4_FC_REPLAY)) |
---|
80 | 104 | return ext4_get_nojournal(); |
---|
81 | | - return jbd2__journal_start(journal, blocks, rsv_blocks, GFP_NOFS, |
---|
82 | | - type, line); |
---|
| 105 | + return jbd2__journal_start(journal, blocks, rsv_blocks, revoke_creds, |
---|
| 106 | + GFP_NOFS, type, line); |
---|
83 | 107 | } |
---|
84 | 108 | |
---|
85 | 109 | int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle) |
---|
.. | .. |
---|
119 | 143 | return ext4_get_nojournal(); |
---|
120 | 144 | |
---|
121 | 145 | sb = handle->h_journal->j_private; |
---|
122 | | - trace_ext4_journal_start_reserved(sb, handle->h_buffer_credits, |
---|
123 | | - _RET_IP_); |
---|
| 146 | + trace_ext4_journal_start_reserved(sb, |
---|
| 147 | + jbd2_handle_buffer_credits(handle), _RET_IP_); |
---|
124 | 148 | err = ext4_journal_check_start(sb); |
---|
125 | 149 | if (err < 0) { |
---|
126 | 150 | jbd2_journal_free_reserved(handle); |
---|
.. | .. |
---|
131 | 155 | if (err < 0) |
---|
132 | 156 | return ERR_PTR(err); |
---|
133 | 157 | return handle; |
---|
| 158 | +} |
---|
| 159 | + |
---|
| 160 | +int __ext4_journal_ensure_credits(handle_t *handle, int check_cred, |
---|
| 161 | + int extend_cred, int revoke_cred) |
---|
| 162 | +{ |
---|
| 163 | + if (!ext4_handle_valid(handle)) |
---|
| 164 | + return 0; |
---|
| 165 | + if (is_handle_aborted(handle)) |
---|
| 166 | + return -EROFS; |
---|
| 167 | + if (jbd2_handle_buffer_credits(handle) >= check_cred && |
---|
| 168 | + handle->h_revoke_credits >= revoke_cred) |
---|
| 169 | + return 0; |
---|
| 170 | + extend_cred = max(0, extend_cred - jbd2_handle_buffer_credits(handle)); |
---|
| 171 | + revoke_cred = max(0, revoke_cred - handle->h_revoke_credits); |
---|
| 172 | + return ext4_journal_extend(handle, extend_cred, revoke_cred); |
---|
134 | 173 | } |
---|
135 | 174 | |
---|
136 | 175 | static void ext4_journal_abort_handle(const char *caller, unsigned int line, |
---|
.. | .. |
---|
158 | 197 | jbd2_journal_abort_handle(handle); |
---|
159 | 198 | } |
---|
160 | 199 | |
---|
| 200 | +static void ext4_check_bdev_write_error(struct super_block *sb) |
---|
| 201 | +{ |
---|
| 202 | + struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping; |
---|
| 203 | + struct ext4_sb_info *sbi = EXT4_SB(sb); |
---|
| 204 | + int err; |
---|
| 205 | + |
---|
| 206 | + /* |
---|
| 207 | + * If the block device has write error flag, it may have failed to |
---|
| 208 | + * async write out metadata buffers in the background. In this case, |
---|
| 209 | + * we could read old data from disk and write it out again, which |
---|
| 210 | + * may lead to on-disk filesystem inconsistency. |
---|
| 211 | + */ |
---|
| 212 | + if (errseq_check(&mapping->wb_err, READ_ONCE(sbi->s_bdev_wb_err))) { |
---|
| 213 | + spin_lock(&sbi->s_bdev_wb_lock); |
---|
| 214 | + err = errseq_check_and_advance(&mapping->wb_err, &sbi->s_bdev_wb_err); |
---|
| 215 | + spin_unlock(&sbi->s_bdev_wb_lock); |
---|
| 216 | + if (err) |
---|
| 217 | + ext4_error_err(sb, -err, |
---|
| 218 | + "Error while async write back metadata"); |
---|
| 219 | + } |
---|
| 220 | +} |
---|
| 221 | + |
---|
161 | 222 | int __ext4_journal_get_write_access(const char *where, unsigned int line, |
---|
162 | 223 | handle_t *handle, struct buffer_head *bh) |
---|
163 | 224 | { |
---|
164 | 225 | int err = 0; |
---|
165 | 226 | |
---|
166 | 227 | might_sleep(); |
---|
| 228 | + |
---|
| 229 | + if (bh->b_bdev->bd_super) |
---|
| 230 | + ext4_check_bdev_write_error(bh->b_bdev->bd_super); |
---|
167 | 231 | |
---|
168 | 232 | if (ext4_handle_valid(handle)) { |
---|
169 | 233 | err = jbd2_journal_get_write_access(handle, bh); |
---|
.. | .. |
---|
234 | 298 | if (err) { |
---|
235 | 299 | ext4_journal_abort_handle(where, line, __func__, |
---|
236 | 300 | bh, handle, err); |
---|
237 | | - __ext4_abort(inode->i_sb, where, line, |
---|
| 301 | + __ext4_abort(inode->i_sb, where, line, -err, |
---|
238 | 302 | "error %d when attempting revoke", err); |
---|
239 | 303 | } |
---|
240 | 304 | BUFFER_TRACE(bh, "exit"); |
---|
.. | .. |
---|
278 | 342 | handle->h_type, |
---|
279 | 343 | handle->h_line_no, |
---|
280 | 344 | handle->h_requested_credits, |
---|
281 | | - handle->h_buffer_credits, err); |
---|
| 345 | + jbd2_handle_buffer_credits(handle), err); |
---|
282 | 346 | return err; |
---|
283 | 347 | } |
---|
284 | 348 | ext4_error_inode(inode, where, line, |
---|
.. | .. |
---|
289 | 353 | handle->h_type, |
---|
290 | 354 | handle->h_line_no, |
---|
291 | 355 | handle->h_requested_credits, |
---|
292 | | - handle->h_buffer_credits, err); |
---|
| 356 | + jbd2_handle_buffer_credits(handle), |
---|
| 357 | + err); |
---|
293 | 358 | } |
---|
294 | 359 | } else { |
---|
| 360 | + set_buffer_uptodate(bh); |
---|
295 | 361 | if (inode) |
---|
296 | 362 | mark_buffer_dirty_inode(bh, inode); |
---|
297 | 363 | else |
---|
.. | .. |
---|
299 | 365 | if (inode && inode_needs_sync(inode)) { |
---|
300 | 366 | sync_dirty_buffer(bh); |
---|
301 | 367 | if (buffer_req(bh) && !buffer_uptodate(bh)) { |
---|
302 | | - struct ext4_super_block *es; |
---|
303 | | - |
---|
304 | | - es = EXT4_SB(inode->i_sb)->s_es; |
---|
305 | | - es->s_last_error_block = |
---|
306 | | - cpu_to_le64(bh->b_blocknr); |
---|
307 | | - ext4_error_inode(inode, where, line, |
---|
308 | | - bh->b_blocknr, |
---|
| 368 | + ext4_error_inode_err(inode, where, line, |
---|
| 369 | + bh->b_blocknr, EIO, |
---|
309 | 370 | "IO error syncing itable block"); |
---|
310 | 371 | err = -EIO; |
---|
311 | 372 | } |
---|