Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
linux
Commits
3595e234
Commit
3595e234
authored
9 years ago
by
Al Viro
Browse files
Options
Download
Email Patches
Plain Diff
link_path_walk: use explicit returns for failure exits
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
deb106c6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
12 deletions
+7
-12
fs/namei.c
fs/namei.c
+7
-12
No files found.
fs/namei.c
View file @
3595e234
...
...
@@ -1772,7 +1772,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
err
=
may_lookup
(
nd
);
if
(
err
)
b
re
ak
;
re
turn
err
;
hash_len
=
hash_name
(
name
);
...
...
@@ -1794,7 +1794,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
struct
qstr
this
=
{
{
.
hash_len
=
hash_len
},
.
name
=
name
};
err
=
parent
->
d_op
->
d_hash
(
parent
,
&
this
);
if
(
err
<
0
)
b
re
ak
;
re
turn
err
;
hash_len
=
this
.
hash_len
;
name
=
this
.
name
;
}
...
...
@@ -1829,15 +1829,13 @@ static int link_path_walk(const char *name, struct nameidata *nd)
err
=
walk_component
(
nd
,
WALK_GET
);
}
if
(
err
<
0
)
b
re
ak
;
re
turn
err
;
if
(
err
)
{
const
char
*
s
=
get_link
(
nd
);
if
(
unlikely
(
IS_ERR
(
s
)))
{
err
=
PTR_ERR
(
s
);
break
;
}
if
(
unlikely
(
IS_ERR
(
s
)))
return
PTR_ERR
(
s
);
err
=
0
;
if
(
unlikely
(
!
s
))
{
/* jumped */
...
...
@@ -1848,12 +1846,9 @@ static int link_path_walk(const char *name, struct nameidata *nd)
continue
;
}
}
if
(
!
d_can_lookup
(
nd
->
path
.
dentry
))
{
err
=
-
ENOTDIR
;
break
;
}
if
(
unlikely
(
!
d_can_lookup
(
nd
->
path
.
dentry
)))
return
-
ENOTDIR
;
}
return
err
;
}
static
const
char
*
path_init
(
int
dfd
,
const
struct
filename
*
name
,
...
...
This diff is collapsed.
Click to expand it.
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