Merge tag 'ext4_for_linus_fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

+2 -1

fs/ext4/ext4.h

··· 2695 2695 struct ext4_filename *fname); 2696 2696 static inline void ext4_update_dx_flag(struct inode *inode) 2697 2697 { 2698 - if (!ext4_has_feature_dir_index(inode->i_sb)) { 2698 + if (!ext4_has_feature_dir_index(inode->i_sb) && 2699 + ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) { 2699 2700 /* ext4_iget() should have caught this... */ 2700 2701 WARN_ON_ONCE(ext4_has_feature_metadata_csum(inode->i_sb)); 2701 2702 ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);

-4

fs/ext4/super.c

··· 2638 2638 } else if (test_opt2(sb, DAX_INODE)) { 2639 2639 SEQ_OPTS_PUTS("dax=inode"); 2640 2640 } 2641 - 2642 - if (test_opt2(sb, JOURNAL_FAST_COMMIT)) 2643 - SEQ_OPTS_PUTS("fast_commit"); 2644 - 2645 2641 ext4_show_quota_options(seq, sb); 2646 2642 return 0; 2647 2643 }

+18 -16

fs/jbd2/journal.c

··· 566 566 } 567 567 568 568 /** 569 - * Force and wait upon a commit if the calling process is not within 570 - * transaction. This is used for forcing out undo-protected data which contains 571 - * bitmaps, when the fs is running out of space. 569 + * jbd2_journal_force_commit_nested - Force and wait upon a commit if the 570 + * calling process is not within transaction. 572 571 * 573 572 * @journal: journal to force 574 573 * Returns true if progress was made. 574 + * 575 + * This is used for forcing out undo-protected data which contains 576 + * bitmaps, when the fs is running out of space. 575 577 */ 576 578 int jbd2_journal_force_commit_nested(journal_t *journal) 577 579 { ··· 584 582 } 585 583 586 584 /** 587 - * int journal_force_commit() - force any uncommitted transactions 585 + * jbd2_journal_force_commit() - force any uncommitted transactions 588 586 * @journal: journal to force 589 587 * 590 588 * Caller want unconditional commit. We can only force the running transaction ··· 1883 1881 1884 1882 1885 1883 /** 1886 - * int jbd2_journal_load() - Read journal from disk. 1884 + * jbd2_journal_load() - Read journal from disk. 1887 1885 * @journal: Journal to act on. 1888 1886 * 1889 1887 * Given a journal_t structure which tells us which disk blocks contain ··· 1953 1951 } 1954 1952 1955 1953 /** 1956 - * void jbd2_journal_destroy() - Release a journal_t structure. 1954 + * jbd2_journal_destroy() - Release a journal_t structure. 1957 1955 * @journal: Journal to act on. 1958 1956 * 1959 1957 * Release a journal_t structure once it is no longer in use by the ··· 2030 2028 2031 2029 2032 2030 /** 2033 - *int jbd2_journal_check_used_features() - Check if features specified are used. 2031 + * jbd2_journal_check_used_features() - Check if features specified are used. 2034 2032 * @journal: Journal to check. 2035 2033 * @compat: bitmask of compatible features 2036 2034 * @ro: bitmask of features that force read-only mount ··· 2065 2063 } 2066 2064 2067 2065 /** 2068 - * int jbd2_journal_check_available_features() - Check feature set in journalling layer 2066 + * jbd2_journal_check_available_features() - Check feature set in journalling layer 2069 2067 * @journal: Journal to check. 2070 2068 * @compat: bitmask of compatible features 2071 2069 * @ro: bitmask of features that force read-only mount ··· 2128 2126 } 2129 2127 2130 2128 /** 2131 - * int jbd2_journal_set_features() - Mark a given journal feature in the superblock 2129 + * jbd2_journal_set_features() - Mark a given journal feature in the superblock 2132 2130 * @journal: Journal to act on. 2133 2131 * @compat: bitmask of compatible features 2134 2132 * @ro: bitmask of features that force read-only mount ··· 2219 2217 } 2220 2218 2221 2219 /* 2222 - * jbd2_journal_clear_features () - Clear a given journal feature in the 2220 + * jbd2_journal_clear_features() - Clear a given journal feature in the 2223 2221 * superblock 2224 2222 * @journal: Journal to act on. 2225 2223 * @compat: bitmask of compatible features ··· 2248 2246 EXPORT_SYMBOL(jbd2_journal_clear_features); 2249 2247 2250 2248 /** 2251 - * int jbd2_journal_flush () - Flush journal 2249 + * jbd2_journal_flush() - Flush journal 2252 2250 * @journal: Journal to act on. 2253 2251 * 2254 2252 * Flush all data for a given journal to disk and empty the journal. ··· 2323 2321 } 2324 2322 2325 2323 /** 2326 - * int jbd2_journal_wipe() - Wipe journal contents 2324 + * jbd2_journal_wipe() - Wipe journal contents 2327 2325 * @journal: Journal to act on. 2328 2326 * @write: flag (see below) 2329 2327 * ··· 2364 2362 } 2365 2363 2366 2364 /** 2367 - * void jbd2_journal_abort () - Shutdown the journal immediately. 2365 + * jbd2_journal_abort () - Shutdown the journal immediately. 2368 2366 * @journal: the journal to shutdown. 2369 2367 * @errno: an error number to record in the journal indicating 2370 2368 * the reason for the shutdown. ··· 2455 2453 } 2456 2454 2457 2455 /** 2458 - * int jbd2_journal_errno () - returns the journal's error state. 2456 + * jbd2_journal_errno() - returns the journal's error state. 2459 2457 * @journal: journal to examine. 2460 2458 * 2461 2459 * This is the errno number set with jbd2_journal_abort(), the last ··· 2479 2477 } 2480 2478 2481 2479 /** 2482 - * int jbd2_journal_clear_err () - clears the journal's error state 2480 + * jbd2_journal_clear_err() - clears the journal's error state 2483 2481 * @journal: journal to act on. 2484 2482 * 2485 2483 * An error must be cleared or acked to take a FS out of readonly ··· 2499 2497 } 2500 2498 2501 2499 /** 2502 - * void jbd2_journal_ack_err() - Ack journal err. 2500 + * jbd2_journal_ack_err() - Ack journal err. 2503 2501 * @journal: journal to act on. 2504 2502 * 2505 2503 * An error must be cleared or acked to take a FS out of readonly

+16 -15

fs/jbd2/transaction.c

··· 519 519 520 520 521 521 /** 522 - * handle_t *jbd2_journal_start() - Obtain a new handle. 522 + * jbd2_journal_start() - Obtain a new handle. 523 523 * @journal: Journal to start transaction on. 524 524 * @nblocks: number of block buffer we might modify 525 525 * ··· 566 566 EXPORT_SYMBOL(jbd2_journal_free_reserved); 567 567 568 568 /** 569 - * int jbd2_journal_start_reserved() - start reserved handle 569 + * jbd2_journal_start_reserved() - start reserved handle 570 570 * @handle: handle to start 571 571 * @type: for handle statistics 572 572 * @line_no: for handle statistics ··· 620 620 EXPORT_SYMBOL(jbd2_journal_start_reserved); 621 621 622 622 /** 623 - * int jbd2_journal_extend() - extend buffer credits. 623 + * jbd2_journal_extend() - extend buffer credits. 624 624 * @handle: handle to 'extend' 625 625 * @nblocks: nr blocks to try to extend by. 626 626 * @revoke_records: number of revoke records to try to extend by. ··· 745 745 } 746 746 747 747 /** 748 - * int jbd2_journal_restart() - restart a handle . 748 + * jbd2__journal_restart() - restart a handle . 749 749 * @handle: handle to restart 750 750 * @nblocks: nr credits requested 751 751 * @revoke_records: number of revoke record credits requested ··· 815 815 EXPORT_SYMBOL(jbd2_journal_restart); 816 816 817 817 /** 818 - * void jbd2_journal_lock_updates () - establish a transaction barrier. 818 + * jbd2_journal_lock_updates () - establish a transaction barrier. 819 819 * @journal: Journal to establish a barrier on. 820 820 * 821 821 * This locks out any further updates from being started, and blocks ··· 874 874 } 875 875 876 876 /** 877 - * void jbd2_journal_unlock_updates (journal_t* journal) - release barrier 877 + * jbd2_journal_unlock_updates () - release barrier 878 878 * @journal: Journal to release the barrier on. 879 879 * 880 880 * Release a transaction barrier obtained with jbd2_journal_lock_updates(). ··· 1182 1182 } 1183 1183 1184 1184 /** 1185 - * int jbd2_journal_get_write_access() - notify intent to modify a buffer for metadata (not data) update. 1185 + * jbd2_journal_get_write_access() - notify intent to modify a buffer 1186 + * for metadata (not data) update. 1186 1187 * @handle: transaction to add buffer modifications to 1187 1188 * @bh: bh to be used for metadata writes 1188 1189 * ··· 1227 1226 * unlocked buffer beforehand. */ 1228 1227 1229 1228 /** 1230 - * int jbd2_journal_get_create_access () - notify intent to use newly created bh 1229 + * jbd2_journal_get_create_access () - notify intent to use newly created bh 1231 1230 * @handle: transaction to new buffer to 1232 1231 * @bh: new buffer. 1233 1232 * ··· 1307 1306 } 1308 1307 1309 1308 /** 1310 - * int jbd2_journal_get_undo_access() - Notify intent to modify metadata with 1309 + * jbd2_journal_get_undo_access() - Notify intent to modify metadata with 1311 1310 * non-rewindable consequences 1312 1311 * @handle: transaction 1313 1312 * @bh: buffer to undo ··· 1384 1383 } 1385 1384 1386 1385 /** 1387 - * void jbd2_journal_set_triggers() - Add triggers for commit writeout 1386 + * jbd2_journal_set_triggers() - Add triggers for commit writeout 1388 1387 * @bh: buffer to trigger on 1389 1388 * @type: struct jbd2_buffer_trigger_type containing the trigger(s). 1390 1389 * ··· 1426 1425 } 1427 1426 1428 1427 /** 1429 - * int jbd2_journal_dirty_metadata() - mark a buffer as containing dirty metadata 1428 + * jbd2_journal_dirty_metadata() - mark a buffer as containing dirty metadata 1430 1429 * @handle: transaction to add buffer to. 1431 1430 * @bh: buffer to mark 1432 1431 * ··· 1594 1593 } 1595 1594 1596 1595 /** 1597 - * void jbd2_journal_forget() - bforget() for potentially-journaled buffers. 1596 + * jbd2_journal_forget() - bforget() for potentially-journaled buffers. 1598 1597 * @handle: transaction handle 1599 1598 * @bh: bh to 'forget' 1600 1599 * ··· 1763 1762 } 1764 1763 1765 1764 /** 1766 - * int jbd2_journal_stop() - complete a transaction 1765 + * jbd2_journal_stop() - complete a transaction 1767 1766 * @handle: transaction to complete. 1768 1767 * 1769 1768 * All done for a particular handle. ··· 2081 2080 } 2082 2081 2083 2082 /** 2084 - * int jbd2_journal_try_to_free_buffers() - try to free page buffers. 2083 + * jbd2_journal_try_to_free_buffers() - try to free page buffers. 2085 2084 * @journal: journal for operation 2086 2085 * @page: to try and free 2087 2086 * ··· 2412 2411 } 2413 2412 2414 2413 /** 2415 - * void jbd2_journal_invalidatepage() 2414 + * jbd2_journal_invalidatepage() 2416 2415 * @journal: journal to use for flush... 2417 2416 * @page: page to flush 2418 2417 * @offset: start of the range to invalidate

+1 -1

include/linux/jbd2.h

··· 401 401 #define JI_WAIT_DATA (1 << __JI_WAIT_DATA) 402 402 403 403 /** 404 - * struct jbd_inode - The jbd_inode type is the structure linking inodes in 404 + * struct jbd2_inode - The jbd_inode type is the structure linking inodes in 405 405 * ordered mode present in a transaction so that we can sync them during commit. 406 406 */ 407 407 struct jbd2_inode {

Configure Feed

Configure Feed