btrfs: rename the option to nospace_cache

[pandora-kernel.git] / fs / nilfs2 / segbuf.c

diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c
index 2853ff2..850a7c0 100644 (file)
--- a/fs/nilfs2/segbuf.c
+++ b/fs/nilfs2/segbuf.c
@@ -239,12 +239,15 @@ nilfs_segbuf_fill_in_super_root_crc(struct nilfs_segment_buffer *segbuf,
                                    u32 seed)
 {
        struct nilfs_super_root *raw_sr;
+       struct the_nilfs *nilfs = segbuf->sb_super->s_fs_info;
+       unsigned srsize;
        u32 crc;
 
        raw_sr = (struct nilfs_super_root *)segbuf->sb_super_root->b_data;
+       srsize = NILFS_SR_BYTES(nilfs->ns_inode_size);
        crc = crc32_le(seed,
                       (unsigned char *)raw_sr + sizeof(raw_sr->sr_sum),
-                      NILFS_SR_BYTES - sizeof(raw_sr->sr_sum));
+                      srsize - sizeof(raw_sr->sr_sum));
        raw_sr->sr_sum = cpu_to_le32(crc);
 }
 
@@ -254,18 +257,6 @@ static void nilfs_release_buffers(struct list_head *list)
 
        list_for_each_entry_safe(bh, n, list, b_assoc_buffers) {
                list_del_init(&bh->b_assoc_buffers);
-               if (buffer_nilfs_allocated(bh)) {
-                       struct page *clone_page = bh->b_page;
-
-                       /* remove clone page */
-                       brelse(bh);
-                       page_cache_release(clone_page); /* for each bh */
-                       if (page_count(clone_page) <= 2) {
-                               lock_page(clone_page);
-                               nilfs_free_private_page(clone_page);
-                       }
-                       continue;
-               }
                brelse(bh);
        }
 }