ext3: Don't warn from writepage when readonly inode is spotted after error

[karo-tx-linux.git] / fs / ext3 / inode.c

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 04da6acde85dfbcfb50d89302c3f975baab3c76d..2ce3c52db325c9f861adba318259cf0d419aead3 100644 (file)
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1134,7 +1134,7 @@ struct buffer_head *ext3_bread(handle_t *handle, struct inode *inode,
                return bh;
        if (buffer_uptodate(bh))
                return bh;
-       ll_rw_block(READ_META, 1, &bh);
+       ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh);
        wait_on_buffer(bh);
        if (buffer_uptodate(bh))
                return bh;
@@ -1617,7 +1617,13 @@ static int ext3_ordered_writepage(struct page *page,
        int err;
 
        J_ASSERT(PageLocked(page));
-       WARN_ON_ONCE(IS_RDONLY(inode));
+       /*
+        * We don't want to warn for emergency remount. The condition is
+        * ordered to avoid dereferencing inode->i_sb in non-error case to
+        * avoid slow-downs.
+        */
+       WARN_ON_ONCE(IS_RDONLY(inode) &&
+                    !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
        /*
         * We give up here if we're reentered, because it might be for a
@@ -1692,7 +1698,13 @@ static int ext3_writeback_writepage(struct page *page,
        int err;
 
        J_ASSERT(PageLocked(page));
-       WARN_ON_ONCE(IS_RDONLY(inode));
+       /*
+        * We don't want to warn for emergency remount. The condition is
+        * ordered to avoid dereferencing inode->i_sb in non-error case to
+        * avoid slow-downs.
+        */
+       WARN_ON_ONCE(IS_RDONLY(inode) &&
+                    !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
        if (ext3_journal_current_handle())
                goto out_fail;
@@ -1735,7 +1747,13 @@ static int ext3_journalled_writepage(struct page *page,
        int err;
 
        J_ASSERT(PageLocked(page));
-       WARN_ON_ONCE(IS_RDONLY(inode));
+       /*
+        * We don't want to warn for emergency remount. The condition is
+        * ordered to avoid dereferencing inode->i_sb in non-error case to
+        * avoid slow-downs.
+        */
+       WARN_ON_ONCE(IS_RDONLY(inode) &&
+                    !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
        if (ext3_journal_current_handle())
                goto no_write;
@@ -2807,7 +2825,7 @@ make_io:
                trace_ext3_load_inode(inode);
                get_bh(bh);
                bh->b_end_io = end_buffer_read_sync;
-               submit_bh(READ_META, bh);
+               submit_bh(READ | REQ_META | REQ_PRIO, bh);
                wait_on_buffer(bh);
                if (!buffer_uptodate(bh)) {
                        ext3_error(inode->i_sb, "ext3_get_inode_loc",