enetc: Migrate to PHYLINK and PCS_LYNX

[linux.git] / fs / jbd2 / commit.c

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 27373f5792a4f7a5a846742cb44e624ad56f5377..6d2da8ad0e6f51a8f2c1b1abf1455cd4654c92d9 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -775,7 +775,7 @@ start_journal_io:
        if (commit_transaction->t_need_data_flush &&
            (journal->j_fs_dev != journal->j_dev) &&
            (journal->j_flags & JBD2_BARRIER))
        if (commit_transaction->t_need_data_flush &&
            (journal->j_fs_dev != journal->j_dev) &&
            (journal->j_flags & JBD2_BARRIER))

-               blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS, NULL);
+               blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS);

 
        /* Done it all: now write the commit record asynchronously. */
        if (jbd2_has_feature_async_commit(journal)) {
 
        /* Done it all: now write the commit record asynchronously. */
        if (jbd2_has_feature_async_commit(journal)) {


@@ -882,7 +882,7 @@ start_journal_io:
        stats.run.rs_blocks_logged++;
        if (jbd2_has_feature_async_commit(journal) &&
            journal->j_flags & JBD2_BARRIER) {
        stats.run.rs_blocks_logged++;
        if (jbd2_has_feature_async_commit(journal) &&
            journal->j_flags & JBD2_BARRIER) {

-               blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL);
+               blkdev_issue_flush(journal->j_dev, GFP_NOFS);

        }
 
        if (err)
        }
 
        if (err)


@@ -997,9 +997,10 @@ restart_loop:
                         * journalled data) we need to unmap buffer and clear
                         * more bits. We also need to be careful about the check
                         * because the data page mapping can get cleared under
                         * journalled data) we need to unmap buffer and clear
                         * more bits. We also need to be careful about the check
                         * because the data page mapping can get cleared under

-                        * out hands, which alse need not to clear more bits
-                        * because the page and buffers will be freed and can
-                        * never be reused once we are done with them.
+                        * our hands. Note that if mapping == NULL, we don't
+                        * need to make buffer unmapped because the page is
+                        * already detached from the mapping and buffers cannot
+                        * get reused.

                         */
                        mapping = READ_ONCE(bh->b_page->mapping);
                        if (mapping && !sb_is_blkdev_sb(mapping->host->i_sb)) {
                         */
                        mapping = READ_ONCE(bh->b_page->mapping);
                        if (mapping && !sb_is_blkdev_sb(mapping->host->i_sb)) {