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: (56 commits)
  [GFS2] Allow journal recovery on read-only mount
  [GFS2] Lockup on error
  [GFS2] Fix page_mkwrite truncation race path
  [GFS2] Fix typo
  [GFS2] Fix write alloc required shortcut calculation
  [GFS2] gfs2_alloc_required performance
  [GFS2] Remove unneeded i_spin
  [GFS2] Reduce inode size by moving i_alloc out of line
  [GFS2] Fix assert in log code
  [GFS2] Fix problems relating to execution of files on GFS2
  [GFS2] Initialize extent_list earlier
  [GFS2] Allow page migration for writeback and ordered pages
  [GFS2] Remove unused variable
  [GFS2] Fix log block mapper
  [GFS2] Minor correction
  [GFS2] Eliminate the no longer needed sd_statfs_mutex
  [GFS2] Incremental patch to fix compiler warning
  [GFS2] Function meta_read optimization
  [GFS2] Only fetch the dinode once in block_map
  [GFS2] Reorganize function gfs2_glmutex_lock
  ...

diff --combined fs/gfs2/sys.c
index 3a3176b846f360b1916b94a85bfc55cd26b03f28,7f828a2cc858dc061278f3cf980eec8df2883674..eaa3b7b2f99e64f4e95206b262a420329e693c61
--- 1/fs/gfs2/sys.c
--- 2/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@@ -32,7 -32,8 +32,8 @@@ spinlock_t gfs2_sys_margs_lock
  
  static ssize_t id_show(struct gfs2_sbd *sdp, char *buf)
  {
-       return snprintf(buf, PAGE_SIZE, "%s\n", sdp->sd_vfs->s_id);
+       return snprintf(buf, PAGE_SIZE, "%u:%u\n",
+                       MAJOR(sdp->sd_vfs->s_dev), MINOR(sdp->sd_vfs->s_dev));
  }
  
  static ssize_t fsname_show(struct gfs2_sbd *sdp, char *buf)
@@@ -221,7 -222,9 +222,7 @@@ static struct kobj_type gfs2_ktype = 
        .sysfs_ops     = &gfs2_attr_ops,
  };
  
 -static struct kset gfs2_kset = {
 -      .ktype  = &gfs2_ktype,
 -};
 +static struct kset *gfs2_kset;
  
  /*
   * display struct lm_lockstruct fields
@@@ -425,13 -428,11 +426,11 @@@ TUNE_ATTR_2(name, name##_store
  TUNE_ATTR(demote_secs, 0);
  TUNE_ATTR(incore_log_blocks, 0);
  TUNE_ATTR(log_flush_secs, 0);
- TUNE_ATTR(jindex_refresh_secs, 0);
  TUNE_ATTR(quota_warn_period, 0);
  TUNE_ATTR(quota_quantum, 0);
  TUNE_ATTR(atime_quantum, 0);
  TUNE_ATTR(max_readahead, 0);
  TUNE_ATTR(complain_secs, 0);
- TUNE_ATTR(reclaim_limit, 0);
  TUNE_ATTR(statfs_slow, 0);
  TUNE_ATTR(new_files_jdata, 0);
  TUNE_ATTR(new_files_directio, 0);
@@@ -448,13 -449,11 +447,11 @@@ static struct attribute *tune_attrs[] 
        &tune_attr_demote_secs.attr,
        &tune_attr_incore_log_blocks.attr,
        &tune_attr_log_flush_secs.attr,
-       &tune_attr_jindex_refresh_secs.attr,
        &tune_attr_quota_warn_period.attr,
        &tune_attr_quota_quantum.attr,
        &tune_attr_atime_quantum.attr,
        &tune_attr_max_readahead.attr,
        &tune_attr_complain_secs.attr,
-       &tune_attr_reclaim_limit.attr,
        &tune_attr_statfs_slow.attr,
        &tune_attr_quota_simul_sync.attr,
        &tune_attr_quota_cache_secs.attr,
@@@ -493,9 -492,14 +490,9 @@@ int gfs2_sys_fs_add(struct gfs2_sbd *sd
  {
        int error;
  
 -      sdp->sd_kobj.kset = &gfs2_kset;
 -      sdp->sd_kobj.ktype = &gfs2_ktype;
 -
 -      error = kobject_set_name(&sdp->sd_kobj, "%s", sdp->sd_table_name);
 -      if (error)
 -              goto fail;
 -
 -      error = kobject_register(&sdp->sd_kobj);
 +      sdp->sd_kobj.kset = gfs2_kset;
 +      error = kobject_init_and_add(&sdp->sd_kobj, &gfs2_ktype, NULL,
 +                                   "%s", sdp->sd_table_name);
        if (error)
                goto fail;
  
@@@ -515,7 -519,6 +512,7 @@@
        if (error)
                goto fail_args;
  
 +      kobject_uevent(&sdp->sd_kobj, KOBJ_ADD);
        return 0;
  
  fail_args:
@@@ -525,7 -528,7 +522,7 @@@ fail_counters
  fail_lockstruct:
        sysfs_remove_group(&sdp->sd_kobj, &lockstruct_group);
  fail_reg:
 -      kobject_unregister(&sdp->sd_kobj);
 +      kobject_put(&sdp->sd_kobj);
  fail:
        fs_err(sdp, "error %d adding sysfs files", error);
        return error;
@@@ -537,22 -540,21 +534,22 @@@ void gfs2_sys_fs_del(struct gfs2_sbd *s
        sysfs_remove_group(&sdp->sd_kobj, &args_group);
        sysfs_remove_group(&sdp->sd_kobj, &counters_group);
        sysfs_remove_group(&sdp->sd_kobj, &lockstruct_group);
 -      kobject_unregister(&sdp->sd_kobj);
 +      kobject_put(&sdp->sd_kobj);
  }
  
  int gfs2_sys_init(void)
  {
        gfs2_sys_margs = NULL;
        spin_lock_init(&gfs2_sys_margs_lock);
 -      kobject_set_name(&gfs2_kset.kobj, "gfs2");
 -      kobj_set_kset_s(&gfs2_kset, fs_subsys);
 -      return kset_register(&gfs2_kset);
 +      gfs2_kset = kset_create_and_add("gfs2", NULL, fs_kobj);
 +      if (!gfs2_kset)
 +              return -ENOMEM;
 +      return 0;
  }
  
  void gfs2_sys_uninit(void)
  {
        kfree(gfs2_sys_margs);
 -      kset_unregister(&gfs2_kset);
 +      kset_unregister(gfs2_kset);
  }