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
1d8e03d3
Commit
1d8e03d3
authored
May 02, 2015
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
namei: trim redundant arguments of trailing_symlink()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
697fc6ca
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
13 deletions
+8
-13
fs/namei.c
fs/namei.c
+8
-13
No files found.
fs/namei.c
View file @
1d8e03d3
...
@@ -1971,14 +1971,15 @@ static void path_cleanup(struct nameidata *nd)
...
@@ -1971,14 +1971,15 @@ static void path_cleanup(struct nameidata *nd)
fput
(
nd
->
base
);
fput
(
nd
->
base
);
}
}
static
int
trailing_symlink
(
struct
path
*
link
,
struct
nameidata
*
nd
,
void
**
p
)
static
int
trailing_symlink
(
struct
nameidata
*
nd
)
{
{
const
char
*
s
;
const
char
*
s
;
int
error
=
may_follow_link
(
link
,
nd
);
int
error
=
may_follow_link
(
&
nd
->
link
,
nd
);
if
(
unlikely
(
error
))
if
(
unlikely
(
error
))
return
error
;
return
error
;
nd
->
flags
|=
LOOKUP_PARENT
;
nd
->
flags
|=
LOOKUP_PARENT
;
s
=
get_link
(
link
,
nd
,
p
);
nd
->
stack
[
0
].
link
=
nd
->
link
;
s
=
get_link
(
&
nd
->
stack
[
0
].
link
,
nd
,
&
nd
->
stack
[
0
].
cookie
);
if
(
unlikely
(
IS_ERR
(
s
)))
if
(
unlikely
(
IS_ERR
(
s
)))
return
PTR_ERR
(
s
);
return
PTR_ERR
(
s
);
if
(
unlikely
(
!
s
))
if
(
unlikely
(
!
s
))
...
@@ -1994,7 +1995,7 @@ static int trailing_symlink(struct path *link, struct nameidata *nd, void **p)
...
@@ -1994,7 +1995,7 @@ static int trailing_symlink(struct path *link, struct nameidata *nd, void **p)
nd
->
inode
=
nd
->
path
.
dentry
->
d_inode
;
nd
->
inode
=
nd
->
path
.
dentry
->
d_inode
;
error
=
link_path_walk
(
s
,
nd
);
error
=
link_path_walk
(
s
,
nd
);
if
(
unlikely
(
error
))
if
(
unlikely
(
error
))
put_link
(
nd
,
link
,
*
p
);
put_link
(
nd
,
&
nd
->
stack
[
0
].
link
,
nd
->
stack
[
0
].
cookie
);
return
error
;
return
error
;
}
}
...
@@ -2031,9 +2032,7 @@ static int path_lookupat(int dfd, const struct filename *name,
...
@@ -2031,9 +2032,7 @@ static int path_lookupat(int dfd, const struct filename *name,
if
(
!
err
&&
!
(
flags
&
LOOKUP_PARENT
))
{
if
(
!
err
&&
!
(
flags
&
LOOKUP_PARENT
))
{
err
=
lookup_last
(
nd
);
err
=
lookup_last
(
nd
);
while
(
err
>
0
)
{
while
(
err
>
0
)
{
nd
->
stack
[
0
].
link
=
nd
->
link
;
err
=
trailing_symlink
(
nd
);
err
=
trailing_symlink
(
&
nd
->
stack
[
0
].
link
,
nd
,
&
nd
->
stack
[
0
].
cookie
);
if
(
err
)
if
(
err
)
break
;
break
;
err
=
lookup_last
(
nd
);
err
=
lookup_last
(
nd
);
...
@@ -2377,9 +2376,7 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path,
...
@@ -2377,9 +2376,7 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path,
err
=
mountpoint_last
(
nd
,
path
);
err
=
mountpoint_last
(
nd
,
path
);
while
(
err
>
0
)
{
while
(
err
>
0
)
{
nd
->
stack
[
0
].
link
=
nd
->
link
;
err
=
trailing_symlink
(
nd
);
err
=
trailing_symlink
(
&
nd
->
stack
[
0
].
link
,
nd
,
&
nd
->
stack
[
0
].
cookie
);
if
(
err
)
if
(
err
)
break
;
break
;
err
=
mountpoint_last
(
nd
,
path
);
err
=
mountpoint_last
(
nd
,
path
);
...
@@ -3261,9 +3258,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
...
@@ -3261,9 +3258,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
error
=
do_last
(
nd
,
file
,
op
,
&
opened
,
pathname
);
error
=
do_last
(
nd
,
file
,
op
,
&
opened
,
pathname
);
while
(
unlikely
(
error
>
0
))
{
/* trailing symlink */
while
(
unlikely
(
error
>
0
))
{
/* trailing symlink */
nd
->
flags
&=
~
(
LOOKUP_OPEN
|
LOOKUP_CREATE
|
LOOKUP_EXCL
);
nd
->
flags
&=
~
(
LOOKUP_OPEN
|
LOOKUP_CREATE
|
LOOKUP_EXCL
);
nd
->
stack
[
0
].
link
=
nd
->
link
;
error
=
trailing_symlink
(
nd
);
error
=
trailing_symlink
(
&
nd
->
stack
[
0
].
link
,
nd
,
&
nd
->
stack
[
0
].
cookie
);
if
(
unlikely
(
error
))
if
(
unlikely
(
error
))
break
;
break
;
error
=
do_last
(
nd
,
file
,
op
,
&
opened
,
pathname
);
error
=
do_last
(
nd
,
file
,
op
,
&
opened
,
pathname
);
...
...
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