Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[~shefty/rdma-dev.git] / fs / xfs / xfs_super.c
index 06d23b976f4cce6b87623532a5cd7bd2f2e4181a..912442cf0f82c3a285fa7d49cab22baa03553f53 100644 (file)
@@ -1342,6 +1342,7 @@ xfs_fs_fill_super(
        sb->s_blocksize = mp->m_sb.sb_blocksize;
        sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
        sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);
+       sb->s_max_links = XFS_MAXLINK;
        sb->s_time_gran = 1;
        set_posix_acl_flag(sb);
 
@@ -1362,10 +1363,10 @@ xfs_fs_fill_super(
                error = EINVAL;
                goto out_syncd_stop;
        }
-       sb->s_root = d_alloc_root(root);
+       sb->s_root = d_make_root(root);
        if (!sb->s_root) {
                error = ENOMEM;
-               goto out_iput;
+               goto out_syncd_stop;
        }
 
        return 0;
@@ -1386,8 +1387,6 @@ out_destroy_workqueues:
  out:
        return -error;
 
- out_iput:
-       iput(root);
  out_syncd_stop:
        xfs_syncd_stop(mp);
  out_unmount: