Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
4d143beb
Commit
4d143beb
authored
Jul 26, 2010
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert ecryptfs
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
d0e46f88
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
fs/ecryptfs/main.c
fs/ecryptfs/main.c
+5
-7
No files found.
fs/ecryptfs/main.c
View file @
4d143beb
...
...
@@ -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(): links the lower filesystem into ecryptfs (inode.c)
*/
static
int
ecryptfs_get_sb
(
struct
file_system_type
*
fs_type
,
int
flags
,
const
char
*
dev_name
,
void
*
raw_data
,
struct
vfsmount
*
mnt
)
static
struct
dentry
*
ecryptfs_mount
(
struct
file_system_type
*
fs_type
,
int
flags
,
const
char
*
dev_name
,
void
*
raw_data
)
{
struct
super_block
*
s
;
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"
;
goto
out
;
}
simple_set_mnt
(
mnt
,
s
);
return
0
;
return
dget
(
s
->
s_root
);
out:
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
);
}
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
=
{
.
owner
=
THIS_MODULE
,
.
name
=
"ecryptfs"
,
.
get_sb
=
ecryptfs_get_sb
,
.
mount
=
ecryptfs_mount
,
.
kill_sb
=
ecryptfs_kill_block_super
,
.
fs_flags
=
0
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment