Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (51 commits)
  [DLM] block dlm_recv in recovery transition
  [DLM] don't overwrite castparam if it's NULL
  [GFS2] Get superblock a different way
  [GFS2] Don't try to remove buffers that don't exist
  [GFS2] Alternate gfs2_iget to avoid looking up inodes being freed
  [GFS2] Data corruption fix
  [GFS2] Clean up journaled data writing
  [GFS2] GFS2: chmod hung - fix race in thread creation
  [DLM] Make dlm_sendd cond_resched more
  [GFS2] Move inode deletion out of blocking_cb
  [GFS2] flocks from same process trip kernel BUG at fs/gfs2/glock.c:1118!
  [GFS2] Clean up gfs2_trans_add_revoke()
  [GFS2] Use slab operations for all gfs2_bufdata allocations
  [GFS2] Replace revoke structure with bufdata structure
  [GFS2] Fix ordering of dirty/journal for ordered buffer unstuffing
  [GFS2] Clean up ordered write code
  [GFS2] Move pin/unpin into lops.c, clean up locking
  [GFS2] Don't mark jdata dirty in gfs2_unstuffer_page()
  [GFS2] Introduce gfs2_remove_from_ail
  [GFS2] Correct lock ordering in unlink
  ...

diff --combined fs/gfs2/super.c
index a2da76b5ae4cc5ac8e37b343b5ca10335484c343,55898023782b2bfffa5afe2424baf43cd5f4f427..dd3e737f528e0b111387b506608e63fc99ef5c0b
--- 1/fs/gfs2/super.c
--- 2/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@@ -58,7 -58,6 +58,6 @@@ void gfs2_tune_init(struct gfs2_tune *g
        gt->gt_incore_log_blocks = 1024;
        gt->gt_log_flush_secs = 60;
        gt->gt_jindex_refresh_secs = 60;
-       gt->gt_scand_secs = 15;
        gt->gt_recoverd_secs = 60;
        gt->gt_logd_secs = 1;
        gt->gt_quotad_secs = 5;
@@@ -160,15 -159,18 +159,15 @@@ int gfs2_check_sb(struct gfs2_sbd *sdp
  }
  
  
 -static int end_bio_io_page(struct bio *bio, unsigned int bytes_done, int error)
 +static void end_bio_io_page(struct bio *bio, int error)
  {
        struct page *page = bio->bi_private;
 -      if (bio->bi_size)
 -              return 1;
  
        if (!error)
                SetPageUptodate(page);
        else
                printk(KERN_WARNING "gfs2: error %d reading superblock\n", error);
        unlock_page(page);
 -      return 0;
  }
  
  static void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf)