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
bf130914
Commit
bf130914
authored
May 29, 2016
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nfs_lookup(): remove debris left over from old sillyunlink exclusion
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
96b0cffb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
fs/nfs/dir.c
fs/nfs/dir.c
+4
-7
No files found.
fs/nfs/dir.c
View file @
bf130914
...
...
@@ -1363,7 +1363,6 @@ EXPORT_SYMBOL_GPL(nfs_dentry_operations);
struct
dentry
*
nfs_lookup
(
struct
inode
*
dir
,
struct
dentry
*
dentry
,
unsigned
int
flags
)
{
struct
dentry
*
res
;
struct
dentry
*
parent
;
struct
inode
*
inode
=
NULL
;
struct
nfs_fh
*
fhandle
=
NULL
;
struct
nfs_fattr
*
fattr
=
NULL
;
...
...
@@ -1393,20 +1392,18 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in
if
(
IS_ERR
(
label
))
goto
out
;
parent
=
dentry
->
d_parent
;
/* Protect against concurrent sillydeletes */
trace_nfs_lookup_enter
(
dir
,
dentry
,
flags
);
error
=
NFS_PROTO
(
dir
)
->
lookup
(
dir
,
&
dentry
->
d_name
,
fhandle
,
fattr
,
label
);
if
(
error
==
-
ENOENT
)
goto
no_entry
;
if
(
error
<
0
)
{
res
=
ERR_PTR
(
error
);
goto
out_
unblock_sillyrename
;
goto
out_
label
;
}
inode
=
nfs_fhget
(
dentry
->
d_sb
,
fhandle
,
fattr
,
label
);
res
=
ERR_CAST
(
inode
);
if
(
IS_ERR
(
res
))
goto
out_
unblock_sillyrename
;
goto
out_
label
;
/* Success: notify readdir to use READDIRPLUS */
nfs_advise_use_readdirplus
(
dir
);
...
...
@@ -1415,11 +1412,11 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in
res
=
d_splice_alias
(
inode
,
dentry
);
if
(
res
!=
NULL
)
{
if
(
IS_ERR
(
res
))
goto
out_
unblock_sillyrename
;
goto
out_
label
;
dentry
=
res
;
}
nfs_set_verifier
(
dentry
,
nfs_save_change_attribute
(
dir
));
out_
unblock_sillyrename
:
out_
label
:
trace_nfs_lookup_exit
(
dir
,
dentry
,
flags
,
error
);
nfs4_label_free
(
label
);
out:
...
...
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