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
nexedi
linux
Commits
1be21f86
Commit
1be21f86
authored
Sep 29, 2015
by
Mike Marshall
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Orangefs: don't use mount_nodev, use sget directly.
Signed-off-by:
Mike Marshall
<
hubcap@omnibond.com
>
parent
8c3905ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
20 deletions
+15
-20
fs/orangefs/super.c
fs/orangefs/super.c
+15
-20
No files found.
fs/orangefs/super.c
View file @
1be21f86
...
...
@@ -422,7 +422,7 @@ struct dentry *pvfs2_mount(struct file_system_type *fst,
struct
super_block
*
sb
=
ERR_PTR
(
-
EINVAL
);
struct
pvfs2_kernel_op_s
*
new_op
;
struct
pvfs2_mount_sb_info_s
mount_sb_info
;
struct
dentry
*
mnt_sb_
d
=
ERR_PTR
(
-
EINVAL
);
struct
dentry
*
d
=
ERR_PTR
(
-
EINVAL
);
gossip_debug
(
GOSSIP_SUPER_DEBUG
,
"pvfs2_mount: called with devname %s
\n
"
,
...
...
@@ -464,23 +464,21 @@ struct dentry *pvfs2_mount(struct file_system_type *fst,
mount_sb_info
.
fs_id
=
new_op
->
downcall
.
resp
.
fs_mount
.
fs_id
;
mount_sb_info
.
id
=
new_op
->
downcall
.
resp
.
fs_mount
.
id
;
/*
* the mount_sb_info structure looks odd, but it's used because
* the private sb info isn't allocated until we call
* pvfs2_fill_sb, yet we have the info we need to fill it with
* here. so we store it temporarily and pass all of the info
* to fill_sb where it's properly copied out
*/
mnt_sb_d
=
mount_nodev
(
fst
,
flags
,
(
void
*
)
&
mount_sb_info
,
pvfs2_fill_sb
);
if
(
IS_ERR
(
mnt_sb_d
))
{
sb
=
ERR_CAST
(
mnt_sb_d
);
sb
=
sget
(
fst
,
NULL
,
set_anon_super
,
flags
,
NULL
);
if
(
IS_ERR
(
sb
))
{
d
=
ERR_CAST
(
sb
);
goto
free_op
;
}
sb
=
mnt_sb_d
->
d_sb
;
ret
=
pvfs2_fill_sb
(
sb
,
(
void
*
)
&
mount_sb_info
,
flags
&
MS_SILENT
?
1
:
0
);
if
(
ret
)
{
d
=
ERR_PTR
(
ret
);
goto
free_op
;
}
/*
* on successful mount, store the devname and data
...
...
@@ -499,7 +497,7 @@ struct dentry *pvfs2_mount(struct file_system_type *fst,
*/
add_pvfs2_sb
(
sb
);
op_release
(
new_op
);
return
mnt_sb_d
;
return
dget
(
sb
->
s_root
)
;
free_op:
gossip_err
(
"pvfs2_mount: mount request failed with %d
\n
"
,
ret
);
...
...
@@ -510,10 +508,7 @@ struct dentry *pvfs2_mount(struct file_system_type *fst,
op_release
(
new_op
);
gossip_debug
(
GOSSIP_SUPER_DEBUG
,
"pvfs2_mount: returning dentry %p
\n
"
,
mnt_sb_d
);
return
mnt_sb_d
;
return
d
;
}
void
pvfs2_kill_sb
(
struct
super_block
*
sb
)
...
...
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