diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 11:36:59 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 11:36:59 -0400 |
| commit | dd504ea16f34a29da4aa933ae7ab917fcfd25fd7 (patch) | |
| tree | 0502645dc159be29c33c992e9e56dc3156074279 /fs/ecryptfs/main.c | |
| parent | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (diff) | |
| parent | 0479ea0eab197b3e5d4c731f526c02e5e3fbfbd0 (diff) | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'fs/ecryptfs/main.c')
| -rw-r--r-- | fs/ecryptfs/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 8cbf3f69ebe5..606128f5c927 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
| @@ -583,8 +583,7 @@ inode_info_init_once(void *vptr, struct kmem_cache *cachep, unsigned long flags) | |||
| 583 | { | 583 | { |
| 584 | struct ecryptfs_inode_info *ei = (struct ecryptfs_inode_info *)vptr; | 584 | struct ecryptfs_inode_info *ei = (struct ecryptfs_inode_info *)vptr; |
| 585 | 585 | ||
| 586 | if (flags & SLAB_CTOR_CONSTRUCTOR) | 586 | inode_init_once(&ei->vfs_inode); |
| 587 | inode_init_once(&ei->vfs_inode); | ||
| 588 | } | 587 | } |
| 589 | 588 | ||
| 590 | static struct ecryptfs_cache_info { | 589 | static struct ecryptfs_cache_info { |