Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
fa3c56bb
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fa3c56bb
编写于
6月 10, 2012
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fs/nfs/dir.c: switch to passing nd->flags instead of nd wherever possible
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
facc3530
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
32 deletion
+19
-32
fs/nfs/dir.c
fs/nfs/dir.c
+19
-32
未找到文件。
fs/nfs/dir.c
浏览文件 @
fa3c56bb
...
@@ -1030,28 +1030,15 @@ static int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
...
@@ -1030,28 +1030,15 @@ static int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
return
1
;
return
1
;
}
}
/*
* Return the intent data that applies to this particular path component
*
* Note that the current set of intents only apply to the very last
* component of the path and none of them is set before that last
* component.
*/
static
inline
unsigned
int
nfs_lookup_check_intent
(
unsigned
int
flags
,
unsigned
int
mask
)
{
return
flags
&
mask
;
}
/*
/*
* Use intent information to check whether or not we're going to do
* Use intent information to check whether or not we're going to do
* an O_EXCL create using this path component.
* an O_EXCL create using this path component.
*/
*/
static
int
nfs_is_exclusive_create
(
struct
inode
*
dir
,
struct
nameidata
*
nd
)
static
int
nfs_is_exclusive_create
(
struct
inode
*
dir
,
unsigned
int
flags
)
{
{
if
(
NFS_PROTO
(
dir
)
->
version
==
2
)
if
(
NFS_PROTO
(
dir
)
->
version
==
2
)
return
0
;
return
0
;
return
nd
&&
nfs_lookup_check_intent
(
nd
->
flags
,
LOOKUP_EXCL
)
;
return
flags
&
LOOKUP_EXCL
;
}
}
/*
/*
...
@@ -1063,20 +1050,18 @@ static int nfs_is_exclusive_create(struct inode *dir, struct nameidata *nd)
...
@@ -1063,20 +1050,18 @@ static int nfs_is_exclusive_create(struct inode *dir, struct nameidata *nd)
*
*
*/
*/
static
inline
static
inline
int
nfs_lookup_verify_inode
(
struct
inode
*
inode
,
struct
nameidata
*
nd
)
int
nfs_lookup_verify_inode
(
struct
inode
*
inode
,
unsigned
int
flags
)
{
{
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
if
(
IS_AUTOMOUNT
(
inode
))
if
(
IS_AUTOMOUNT
(
inode
))
return
0
;
return
0
;
/* VFS wants an on-the-wire revalidation */
/* VFS wants an on-the-wire revalidation */
if
(
nd
->
flags
&
LOOKUP_REVAL
)
if
(
flags
&
LOOKUP_REVAL
)
goto
out_force
;
goto
out_force
;
/* This is an open(2) */
/* This is an open(2) */
if
(
nfs_lookup_check_intent
(
nd
->
flags
,
LOOKUP_OPEN
)
!=
0
&&
if
((
flags
&
LOOKUP_OPEN
)
&&
!
(
server
->
flags
&
NFS_MOUNT_NOCTO
)
&&
!
(
server
->
flags
&
NFS_MOUNT_NOCTO
)
&&
(
S_ISREG
(
inode
->
i_mode
)
||
S_ISDIR
(
inode
->
i_mode
)))
(
S_ISREG
(
inode
->
i_mode
)
||
S_ISDIR
(
inode
->
i_mode
)))
goto
out_force
;
goto
out_force
;
return
0
;
return
0
;
out_force:
out_force:
...
@@ -1092,10 +1077,10 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd)
...
@@ -1092,10 +1077,10 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd)
*/
*/
static
inline
static
inline
int
nfs_neg_need_reval
(
struct
inode
*
dir
,
struct
dentry
*
dentry
,
int
nfs_neg_need_reval
(
struct
inode
*
dir
,
struct
dentry
*
dentry
,
struct
nameidata
*
nd
)
unsigned
int
flags
)
{
{
/* Don't revalidate a negative dentry if we're creating a new file */
/* Don't revalidate a negative dentry if we're creating a new file */
if
(
nd
!=
NULL
&&
nfs_lookup_check_intent
(
nd
->
flags
,
LOOKUP_CREATE
)
!=
0
)
if
(
flags
&
LOOKUP_CREATE
)
return
0
;
return
0
;
if
(
NFS_SERVER
(
dir
)
->
flags
&
NFS_MOUNT_LOOKUP_CACHE_NONEG
)
if
(
NFS_SERVER
(
dir
)
->
flags
&
NFS_MOUNT_LOOKUP_CACHE_NONEG
)
return
1
;
return
1
;
...
@@ -1115,6 +1100,7 @@ int nfs_neg_need_reval(struct inode *dir, struct dentry *dentry,
...
@@ -1115,6 +1100,7 @@ int nfs_neg_need_reval(struct inode *dir, struct dentry *dentry,
*/
*/
static
int
nfs_lookup_revalidate
(
struct
dentry
*
dentry
,
struct
nameidata
*
nd
)
static
int
nfs_lookup_revalidate
(
struct
dentry
*
dentry
,
struct
nameidata
*
nd
)
{
{
unsigned
int
flags
=
nd
->
flags
;
struct
inode
*
dir
;
struct
inode
*
dir
;
struct
inode
*
inode
;
struct
inode
*
inode
;
struct
dentry
*
parent
;
struct
dentry
*
parent
;
...
@@ -1122,7 +1108,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
...
@@ -1122,7 +1108,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
struct
nfs_fattr
*
fattr
=
NULL
;
struct
nfs_fattr
*
fattr
=
NULL
;
int
error
;
int
error
;
if
(
nd
->
flags
&
LOOKUP_RCU
)
if
(
flags
&
LOOKUP_RCU
)
return
-
ECHILD
;
return
-
ECHILD
;
parent
=
dget_parent
(
dentry
);
parent
=
dget_parent
(
dentry
);
...
@@ -1131,7 +1117,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
...
@@ -1131,7 +1117,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
inode
=
dentry
->
d_inode
;
inode
=
dentry
->
d_inode
;
if
(
!
inode
)
{
if
(
!
inode
)
{
if
(
nfs_neg_need_reval
(
dir
,
dentry
,
nd
))
if
(
nfs_neg_need_reval
(
dir
,
dentry
,
flags
))
goto
out_bad
;
goto
out_bad
;
goto
out_valid_noent
;
goto
out_valid_noent
;
}
}
...
@@ -1147,8 +1133,8 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
...
@@ -1147,8 +1133,8 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
goto
out_set_verifier
;
goto
out_set_verifier
;
/* Force a full look up iff the parent directory has changed */
/* Force a full look up iff the parent directory has changed */
if
(
!
nfs_is_exclusive_create
(
dir
,
nd
)
&&
nfs_check_verifier
(
dir
,
dentry
))
{
if
(
!
nfs_is_exclusive_create
(
dir
,
flags
)
&&
nfs_check_verifier
(
dir
,
dentry
))
{
if
(
nfs_lookup_verify_inode
(
inode
,
nd
))
if
(
nfs_lookup_verify_inode
(
inode
,
flags
))
goto
out_zap_parent
;
goto
out_zap_parent
;
goto
out_valid
;
goto
out_valid
;
}
}
...
@@ -1306,7 +1292,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
...
@@ -1306,7 +1292,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
* If we're doing an exclusive create, optimize away the lookup
* If we're doing an exclusive create, optimize away the lookup
* but don't hash the dentry.
* but don't hash the dentry.
*/
*/
if
(
n
fs_is_exclusive_create
(
dir
,
nd
))
{
if
(
n
d
&&
nfs_is_exclusive_create
(
dir
,
nd
->
flags
))
{
d_instantiate
(
dentry
,
NULL
);
d_instantiate
(
dentry
,
NULL
);
res
=
NULL
;
res
=
NULL
;
goto
out
;
goto
out
;
...
@@ -1507,15 +1493,16 @@ static int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
...
@@ -1507,15 +1493,16 @@ static int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
static
int
nfs4_lookup_revalidate
(
struct
dentry
*
dentry
,
struct
nameidata
*
nd
)
static
int
nfs4_lookup_revalidate
(
struct
dentry
*
dentry
,
struct
nameidata
*
nd
)
{
{
unsigned
int
flags
=
nd
->
flags
;
struct
dentry
*
parent
=
NULL
;
struct
dentry
*
parent
=
NULL
;
struct
inode
*
inode
;
struct
inode
*
inode
;
struct
inode
*
dir
;
struct
inode
*
dir
;
int
ret
=
0
;
int
ret
=
0
;
if
(
nd
->
flags
&
LOOKUP_RCU
)
if
(
flags
&
LOOKUP_RCU
)
return
-
ECHILD
;
return
-
ECHILD
;
if
(
!
(
nd
->
flags
&
LOOKUP_OPEN
)
||
(
nd
->
flags
&
LOOKUP_DIRECTORY
))
if
(
!
(
flags
&
LOOKUP_OPEN
)
||
(
flags
&
LOOKUP_DIRECTORY
))
goto
no_open
;
goto
no_open
;
if
(
d_mountpoint
(
dentry
))
if
(
d_mountpoint
(
dentry
))
goto
no_open
;
goto
no_open
;
...
@@ -1528,7 +1515,7 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
...
@@ -1528,7 +1515,7 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
* optimize away revalidation of negative dentries.
* optimize away revalidation of negative dentries.
*/
*/
if
(
inode
==
NULL
)
{
if
(
inode
==
NULL
)
{
if
(
!
nfs_neg_need_reval
(
dir
,
dentry
,
nd
))
if
(
!
nfs_neg_need_reval
(
dir
,
dentry
,
flags
))
ret
=
1
;
ret
=
1
;
goto
out
;
goto
out
;
}
}
...
@@ -1537,7 +1524,7 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
...
@@ -1537,7 +1524,7 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
if
(
!
S_ISREG
(
inode
->
i_mode
))
if
(
!
S_ISREG
(
inode
->
i_mode
))
goto
no_open_dput
;
goto
no_open_dput
;
/* We cannot do exclusive creation on a positive dentry */
/* We cannot do exclusive creation on a positive dentry */
if
(
nd
&&
nd
->
flags
&
LOOKUP_EXCL
)
if
(
flags
&
LOOKUP_EXCL
)
goto
no_open_dput
;
goto
no_open_dput
;
/* Let f_op->open() actually open (and revalidate) the file */
/* Let f_op->open() actually open (and revalidate) the file */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录