From 706757eea7ee766c1beade1421dff3ef269ff2c3 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Fri, 3 Feb 2006 03:04:06 -0800 Subject: [PATCH] --- yaml --- r: 19637 b: refs/heads/master c: 47ba87e0b1269698801310bfd1716b0538282405 h: refs/heads/master i: 19635: f575cc1a24f5e043763ef733efd4a29e70b5e068 v: v3 --- [refs] | 2 +- trunk/fs/dcache.c | 2 ++ trunk/include/linux/dcache.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 66bccaed558e..7a37deb5506a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09114eb8c53d2d3b2ff9523e011cb68b2e245dce +refs/heads/master: 47ba87e0b1269698801310bfd1716b0538282405 diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c index 86bdb93789c6..a173bba32666 100644 --- a/trunk/fs/dcache.c +++ b/trunk/fs/dcache.c @@ -743,7 +743,9 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name) dentry->d_op = NULL; dentry->d_fsdata = NULL; dentry->d_mounted = 0; +#ifdef CONFIG_PROFILING dentry->d_cookie = NULL; +#endif INIT_HLIST_NODE(&dentry->d_hash); INIT_LIST_HEAD(&dentry->d_lru); INIT_LIST_HEAD(&dentry->d_subdirs); diff --git a/trunk/include/linux/dcache.h b/trunk/include/linux/dcache.h index a3ed5e059d47..a3f09947940e 100644 --- a/trunk/include/linux/dcache.h +++ b/trunk/include/linux/dcache.h @@ -108,7 +108,9 @@ struct dentry { struct dentry_operations *d_op; struct super_block *d_sb; /* The root of the dentry tree */ void *d_fsdata; /* fs-specific data */ +#ifdef CONFIG_PROFILING struct dcookie_struct *d_cookie; /* cookie, if any */ +#endif int d_mounted; unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */ };