Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
linux-seco-imx
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Jira
Code
Merge requests
13
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Clea OS
bsp
nxp
linux-seco-imx
Commits
93420b40
Commit
93420b40
authored
12 years ago
by
Al Viro
Browse files
Options
Downloads
Patches
Plain Diff
switch nfs_lookup_check_intent() away from nameidata
just pass the flags Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
02e5180d
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fs/nfs/dir.c
+5
-5
5 additions, 5 deletions
fs/nfs/dir.c
with
5 additions
and
5 deletions
fs/nfs/dir.c
+
5
−
5
View file @
93420b40
...
...
@@ -1037,10 +1037,10 @@ static int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
* component of the path and none of them is set before that last
* component.
*/
static
inline
unsigned
int
nfs_lookup_check_intent
(
struct
nameidata
*
nd
,
static
inline
unsigned
int
nfs_lookup_check_intent
(
unsigned
int
flags
,
unsigned
int
mask
)
{
return
nd
->
flags
&
mask
;
return
flags
&
mask
;
}
/*
...
...
@@ -1051,7 +1051,7 @@ static int nfs_is_exclusive_create(struct inode *dir, struct nameidata *nd)
{
if
(
NFS_PROTO
(
dir
)
->
version
==
2
)
return
0
;
return
nd
&&
nfs_lookup_check_intent
(
nd
,
LOOKUP_EXCL
);
return
nd
&&
nfs_lookup_check_intent
(
nd
->
flags
,
LOOKUP_EXCL
);
}
/*
...
...
@@ -1074,7 +1074,7 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd)
if
(
nd
->
flags
&
LOOKUP_REVAL
)
goto
out_force
;
/* This is an open(2) */
if
(
nfs_lookup_check_intent
(
nd
,
LOOKUP_OPEN
)
!=
0
&&
if
(
nfs_lookup_check_intent
(
nd
->
flags
,
LOOKUP_OPEN
)
!=
0
&&
!
(
server
->
flags
&
NFS_MOUNT_NOCTO
)
&&
(
S_ISREG
(
inode
->
i_mode
)
||
S_ISDIR
(
inode
->
i_mode
)))
...
...
@@ -1098,7 +1098,7 @@ int nfs_neg_need_reval(struct inode *dir, struct dentry *dentry,
struct
nameidata
*
nd
)
{
/* Don't revalidate a negative dentry if we're creating a new file */
if
(
nd
!=
NULL
&&
nfs_lookup_check_intent
(
nd
,
LOOKUP_CREATE
)
!=
0
)
if
(
nd
!=
NULL
&&
nfs_lookup_check_intent
(
nd
->
flags
,
LOOKUP_CREATE
)
!=
0
)
return
0
;
if
(
NFS_SERVER
(
dir
)
->
flags
&
NFS_MOUNT_LOOKUP_CACHE_NONEG
)
return
1
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment