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
b9ff4429
Commit
b9ff4429
authored
May 02, 2015
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
namei: trim redundant arguments of fs/namei.c:put_link()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
1d8e03d3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
12 deletions
+13
-12
fs/namei.c
fs/namei.c
+13
-12
No files found.
fs/namei.c
View file @
b9ff4429
...
@@ -718,12 +718,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
...
@@ -718,12 +718,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
nd
->
flags
|=
LOOKUP_JUMPED
;
nd
->
flags
|=
LOOKUP_JUMPED
;
}
}
static
inline
void
put_link
(
struct
nameidata
*
nd
,
struct
path
*
link
,
void
*
cookie
)
static
inline
void
put_link
(
struct
nameidata
*
nd
)
{
{
struct
inode
*
inode
=
link
->
dentry
->
d_inode
;
struct
saved
*
last
=
nd
->
stack
+
nd
->
depth
;
if
(
cookie
&&
inode
->
i_op
->
put_link
)
struct
inode
*
inode
=
last
->
link
.
dentry
->
d_inode
;
inode
->
i_op
->
put_link
(
link
->
dentry
,
cookie
);
if
(
last
->
cookie
&&
inode
->
i_op
->
put_link
)
path_put
(
link
);
inode
->
i_op
->
put_link
(
last
->
link
.
dentry
,
last
->
cookie
);
path_put
(
&
last
->
link
);
}
}
int
sysctl_protected_symlinks
__read_mostly
=
0
;
int
sysctl_protected_symlinks
__read_mostly
=
0
;
...
@@ -1809,7 +1810,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
...
@@ -1809,7 +1810,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
err
=
0
;
err
=
0
;
if
(
unlikely
(
!
s
))
{
if
(
unlikely
(
!
s
))
{
/* jumped */
/* jumped */
put_link
(
nd
,
&
last
->
link
,
last
->
cookie
);
put_link
(
nd
);
current
->
link_count
--
;
current
->
link_count
--
;
nd
->
depth
--
;
nd
->
depth
--
;
last
--
;
last
--
;
...
@@ -1840,7 +1841,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
...
@@ -1840,7 +1841,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
terminate_walk
(
nd
);
terminate_walk
(
nd
);
Err:
Err:
while
(
unlikely
(
nd
->
depth
))
{
while
(
unlikely
(
nd
->
depth
))
{
put_link
(
nd
,
&
last
->
link
,
last
->
cookie
);
put_link
(
nd
);
current
->
link_count
--
;
current
->
link_count
--
;
nd
->
depth
--
;
nd
->
depth
--
;
last
--
;
last
--
;
...
@@ -1850,7 +1851,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
...
@@ -1850,7 +1851,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if
(
unlikely
(
nd
->
depth
))
{
if
(
unlikely
(
nd
->
depth
))
{
name
=
last
->
name
;
name
=
last
->
name
;
err
=
walk_component
(
nd
,
LOOKUP_FOLLOW
);
err
=
walk_component
(
nd
,
LOOKUP_FOLLOW
);
put_link
(
nd
,
&
last
->
link
,
last
->
cookie
);
put_link
(
nd
);
current
->
link_count
--
;
current
->
link_count
--
;
nd
->
depth
--
;
nd
->
depth
--
;
last
--
;
last
--
;
...
@@ -1995,7 +1996,7 @@ static int trailing_symlink(struct nameidata *nd)
...
@@ -1995,7 +1996,7 @@ static int trailing_symlink(struct nameidata *nd)
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
,
&
nd
->
stack
[
0
].
link
,
nd
->
stack
[
0
].
cookie
);
put_link
(
nd
);
return
error
;
return
error
;
}
}
...
@@ -2036,7 +2037,7 @@ static int path_lookupat(int dfd, const struct filename *name,
...
@@ -2036,7 +2037,7 @@ static int path_lookupat(int dfd, const struct filename *name,
if
(
err
)
if
(
err
)
break
;
break
;
err
=
lookup_last
(
nd
);
err
=
lookup_last
(
nd
);
put_link
(
nd
,
&
nd
->
stack
[
0
].
link
,
nd
->
stack
[
0
].
cookie
);
put_link
(
nd
);
}
}
}
}
...
@@ -2380,7 +2381,7 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path,
...
@@ -2380,7 +2381,7 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path,
if
(
err
)
if
(
err
)
break
;
break
;
err
=
mountpoint_last
(
nd
,
path
);
err
=
mountpoint_last
(
nd
,
path
);
put_link
(
nd
,
&
nd
->
stack
[
0
].
link
,
nd
->
stack
[
0
].
cookie
);
put_link
(
nd
);
}
}
out:
out:
path_cleanup
(
nd
);
path_cleanup
(
nd
);
...
@@ -3262,7 +3263,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
...
@@ -3262,7 +3263,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
if
(
unlikely
(
error
))
if
(
unlikely
(
error
))
break
;
break
;
error
=
do_last
(
nd
,
file
,
op
,
&
opened
,
pathname
);
error
=
do_last
(
nd
,
file
,
op
,
&
opened
,
pathname
);
put_link
(
nd
,
&
nd
->
stack
[
0
].
link
,
nd
->
stack
[
0
].
cookie
);
put_link
(
nd
);
}
}
out:
out:
path_cleanup
(
nd
);
path_cleanup
(
nd
);
...
...
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