← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to ubuntu/aufs/dir.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu/aufs/dir.c
33
33
        nlink += h_dir->i_nlink - 2;
34
34
        if (h_dir->i_nlink < 2)
35
35
                nlink += 2;
 
36
        /* 0 can happen in revaliding */
36
37
        set_nlink(dir, nlink);
37
38
}
38
39
 
46
47
        nlink -= h_dir->i_nlink - 2;
47
48
        if (h_dir->i_nlink < 2)
48
49
                nlink -= 2;
 
50
        /* nlink == 0 means the branch-fs is broken */
49
51
        set_nlink(dir, nlink);
50
52
}
51
53