Merge tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[~andy/linux] / fs / nilfs2 / mdt.c

diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index f9897d09c6934a9769ecddf53f4e595501138673..c4dcd1db57ee9c7e158479416dd1c80a67c834cf 100644 (file)
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -375,14 +375,25 @@ int nilfs_mdt_fetch_dirty(struct inode *inode)
 static int
 nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)
 {
-       struct inode *inode;
+       struct inode *inode = page->mapping->host;
        struct super_block *sb;
        int err = 0;
 
+       if (inode && (inode->i_sb->s_flags & MS_RDONLY)) {
+               /*
+                * It means that filesystem was remounted in read-only
+                * mode because of error or metadata corruption. But we
+                * have dirty pages that try to be flushed in background.
+                * So, here we simply discard this dirty page.
+                */
+               nilfs_clear_dirty_page(page, false);
+               unlock_page(page);
+               return -EROFS;
+       }
+
        redirty_page_for_writepage(wbc, page);
        unlock_page(page);
 
-       inode = page->mapping->host;
        if (!inode)
                return 0;
 
@@ -561,10 +572,10 @@ void nilfs_mdt_restore_from_shadow_map(struct inode *inode)
        if (mi->mi_palloc_cache)
                nilfs_palloc_clear_cache(inode);
 
-       nilfs_clear_dirty_pages(inode->i_mapping);
+       nilfs_clear_dirty_pages(inode->i_mapping, true);
        nilfs_copy_back_pages(inode->i_mapping, &shadow->frozen_data);
 
-       nilfs_clear_dirty_pages(&ii->i_btnode_cache);
+       nilfs_clear_dirty_pages(&ii->i_btnode_cache, true);
        nilfs_copy_back_pages(&ii->i_btnode_cache, &shadow->frozen_btnodes);
 
        nilfs_bmap_restore(ii->i_bmap, &shadow->bmap_store);