diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 14:13:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 14:13:25 -0700 |
| commit | bd1bfe40ac6bdf9593da29b822bc301b77a97d6a (patch) | |
| tree | 332328b76dc4a3d51419c1d1cb23f50eb6c034c8 /fs/ecryptfs/super.c | |
| parent | Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd (diff) | |
| parent | eCryptfs: Remove ecryptfs_header_cache_2 (diff) | |
| download | linux-dev-bd1bfe40ac6bdf9593da29b822bc301b77a97d6a.tar.xz linux-dev-bd1bfe40ac6bdf9593da29b822bc301b77a97d6a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
eCryptfs: Remove ecryptfs_header_cache_2
eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()
eCryptfs: Return useful code from contains_ecryptfs_marker
eCryptfs: Fix new inode race condition
eCryptfs: Cleanup inode initialization code
eCryptfs: Consolidate inode functions into inode.c
Diffstat (limited to 'fs/ecryptfs/super.c')
| -rw-r--r-- | fs/ecryptfs/super.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c index 245b517bf1b6..dbd52d40df4c 100644 --- a/fs/ecryptfs/super.c +++ b/fs/ecryptfs/super.c @@ -93,22 +93,6 @@ static void ecryptfs_destroy_inode(struct inode *inode) } /** - * ecryptfs_init_inode - * @inode: The ecryptfs inode - * - * Set up the ecryptfs inode. - */ -void ecryptfs_init_inode(struct inode *inode, struct inode *lower_inode) -{ - ecryptfs_set_inode_lower(inode, lower_inode); - inode->i_ino = lower_inode->i_ino; - inode->i_version++; - inode->i_op = &ecryptfs_main_iops; - inode->i_fop = &ecryptfs_main_fops; - inode->i_mapping->a_ops = &ecryptfs_aops; -} - -/** * ecryptfs_statfs * @sb: The ecryptfs super block * @buf: The struct kstatfs to fill in with stats |