diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 03:21:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 03:21:19 +0200 |
| commit | f3ad116588151b3371ae4e092290e4f48e62b8bb (patch) | |
| tree | d652861a54132e35de2a80631f671cd7be0b26f6 /fs/configfs/configfs_internal.h | |
| parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | configfs: Rework configfs_depend_item() locking and make lockdep happy (diff) | |
| download | linux-f3ad116588151b3371ae4e092290e4f48e62b8bb.tar.xz linux-f3ad116588151b3371ae4e092290e4f48e62b8bb.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs:
configfs: Rework configfs_depend_item() locking and make lockdep happy
configfs: Silence lockdep on mkdir() and rmdir()
Diffstat (limited to 'fs/configfs/configfs_internal.h')
| -rw-r--r-- | fs/configfs/configfs_internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h index 762d287123ca..da6061a6df40 100644 --- a/fs/configfs/configfs_internal.h +++ b/fs/configfs/configfs_internal.h @@ -39,6 +39,9 @@ struct configfs_dirent { umode_t s_mode; struct dentry * s_dentry; struct iattr * s_iattr; +#ifdef CONFIG_LOCKDEP + int s_depth; +#endif }; #define CONFIGFS_ROOT 0x0001 |