← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to fs/ext2/super.c

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/ext2/super.c
919
919
        }
920
920
 
921
921
        sb->s_maxbytes = ext2_max_size(sb->s_blocksize_bits);
 
922
        sb->s_max_links = EXT2_LINK_MAX;
922
923
 
923
924
        if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV) {
924
925
                sbi->s_inode_size = EXT2_GOOD_OLD_INODE_SIZE;
1087
1088
                goto failed_mount3;
1088
1089
        }
1089
1090
 
1090
 
        sb->s_root = d_alloc_root(root);
 
1091
        sb->s_root = d_make_root(root);
1091
1092
        if (!sb->s_root) {
1092
 
                iput(root);
1093
1093
                ext2_msg(sb, KERN_ERR, "error: get root inode failed");
1094
1094
                ret = -ENOMEM;
1095
1095
                goto failed_mount3;