Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / fs / jbd / revoke.c

diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index 1564a48..df95ec1 100644 (file)
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -187,9 +187,9 @@ int __init journal_init_revoke_caches(void)
 void journal_destroy_revoke_caches(void)
 {
        kmem_cache_destroy(revoke_record_cache);
-       revoke_record_cache = 0;
+       revoke_record_cache = NULL;
        kmem_cache_destroy(revoke_table_cache);
-       revoke_table_cache = 0;
+       revoke_table_cache = NULL;
 }
 
 /* Initialise the revoke table for a given journal to a given size. */
@@ -332,6 +332,7 @@ int journal_revoke(handle_t *handle, unsigned long blocknr,
        struct block_device *bdev;
        int err;
 
+       might_sleep();
        if (bh_in)
                BUFFER_TRACE(bh_in, "enter");
 
@@ -522,7 +523,7 @@ void journal_write_revoke_records(journal_t *journal,
                        kmem_cache_free(revoke_record_cache, record);
                }
        }
-       if (descriptor) 
+       if (descriptor)
                flush_descriptor(journal, descriptor, offset);
        jbd_debug(1, "Wrote %d revoke records\n", count);
 }
@@ -606,7 +607,7 @@ static void flush_descriptor(journal_t *journal,
        header->r_count = htonl(offset);
        set_buffer_jwrite(bh);
        BUFFER_TRACE(bh, "write");
-       set_buffer_uptodate(bh);
+       set_buffer_dirty(bh);
        ll_rw_block(WRITE, 1, &bh);
 }
 #endif