Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

convert ecryptfs

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2010-07-26 13:33:36 +04:00
parent d0e46f88b2
commit 4d143beb04
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/ecryptfs/main.c
View file

@ -540,9 +540,8 @@ static int ecryptfs_read_super(struct super_block *sb, const char *dev_name)
* ecryptfs_interpose to perform most of the linking * ecryptfs_interpose to perform most of the linking
* ecryptfs_interpose(): links the lower filesystem into ecryptfs (inode.c) * ecryptfs_interpose(): links the lower filesystem into ecryptfs (inode.c)
*/ */
static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags, static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags,
const char *dev_name, void *raw_data, const char *dev_name, void *raw_data)
struct vfsmount *mnt)
{ {
struct super_block *s; struct super_block *s;
struct ecryptfs_sb_info *sbi; struct ecryptfs_sb_info *sbi;
@ -607,8 +606,7 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags,
err = "Reading sb failed"; err = "Reading sb failed";
goto out; goto out;
} }
simple_set_mnt(mnt, s); return dget(s->s_root);
return 0;
out: out:
if (sbi) { if (sbi) {
@ -616,7 +614,7 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags,
kmem_cache_free(ecryptfs_sb_info_cache, sbi); kmem_cache_free(ecryptfs_sb_info_cache, sbi);
} }
printk(KERN_ERR "%s; rc = [%d]\n", err, rc); printk(KERN_ERR "%s; rc = [%d]\n", err, rc);
return rc; return ERR_PTR(rc);
} }
/** /**
@ -639,7 +637,7 @@ static void ecryptfs_kill_block_super(struct super_block *sb)
static struct file_system_type ecryptfs_fs_type = { static struct file_system_type ecryptfs_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "ecryptfs", .name = "ecryptfs",
.get_sb = ecryptfs_get_sb, .mount = ecryptfs_mount,
.kill_sb = ecryptfs_kill_block_super, .kill_sb = ecryptfs_kill_block_super,
.fs_flags = 0 .fs_flags = 0
}; };