Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  sysfs: cosmetic clean up on node creation failure paths
  sysfs: kill an extra put in sysfs_create_link() failure path
  Driver core: check return code of sysfs_create_link()
  HOWTO: Add the knwon_regression URI to the documentation
  dev_vdbg() documentation
  dev_vdbg(), available with -DVERBOSE_DEBUG
  sysfs: make sysfs_init_inode() static
  sysfs: fix sysfs root inode nlink accounting
  Documentation fix devres.txt: lib/iomap.c -> lib/devres.c
  sysfs: avoid kmem_cache_free(NULL)
  PM: remove deprecated dpm_runtime_* routines
  PM: Remove deprecated sysfs files
  Driver core: accept all valid action-strings in uevent-trigger
  debugfs: remove rmdir() non-empty complaint

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 402cc356203c..60714d075c2f 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -43,19 +43,19 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_time_gran = 1;
         sysfs_sb = sb;
 
-        inode = new_inode(sysfs_sb);
+        /* get root inode, initialize and unlock it */
+        inode = sysfs_get_inode(&sysfs_root);
         if (!inode) {
                 pr_debug("sysfs: could not get root inode\n");
                 return -ENOMEM;
         }
 
-        sysfs_init_inode(&sysfs_root, inode);
-
         inode->i_op = &sysfs_dir_inode_operations;
         inode->i_fop = &sysfs_dir_operations;
-        /* directory inodes start off with i_nlink == 2 (for "." entry) */
-        inc_nlink(inode);
+        inc_nlink(inode); /* directory, account for "." */
+        unlock_new_inode(inode);
 
+        /* instantiate and link root dentry */
         root = d_alloc_root(inode);
         if (!root) {
                 pr_debug("%s: could not get root dentry!\n",__FUNCTION__);