← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/nfs/fscache.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:
fs/nfs/fscache.c
64
64
 * either by the 'fsc=xxx' option to mount, or by inheriting it from the parent
65
65
 * superblock across an automount point of some nature.
66
66
 */
67
 
void nfs_fscache_get_super_cookie(struct super_block *sb, const char *uniq,
68
 
                                  struct nfs_clone_mount *mntdata)
 
67
void nfs_fscache_get_super_cookie(struct super_block *sb, const char *uniq, int ulen)
69
68
{
70
69
        struct nfs_fscache_key *key, *xkey;
71
70
        struct nfs_server *nfss = NFS_SB(sb);
72
71
        struct rb_node **p, *parent;
73
 
        int diff, ulen;
74
 
 
75
 
        if (uniq) {
76
 
                ulen = strlen(uniq);
77
 
        } else if (mntdata) {
78
 
                struct nfs_server *mnt_s = NFS_SB(mntdata->sb);
79
 
                if (mnt_s->fscache_key) {
80
 
                        uniq = mnt_s->fscache_key->key.uniquifier;
81
 
                        ulen = mnt_s->fscache_key->key.uniq_len;
82
 
                }
83
 
        }
 
72
        int diff;
84
73
 
85
74
        if (!uniq) {
86
75
                uniq = "";