Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
kernel_linux
提交
d9b67e1e
K
kernel_linux
项目概览
OpenHarmony
/
kernel_linux
上一次同步 3 年多
通知
13
Star
8
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kernel_linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
d9b67e1e
编写于
1月 11, 2017
作者:
A
Anna Schumaker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
NFS: Fix inconsistent indentation in nfs4proc.c
Signed-off-by:
N
Anna Schumaker
<
Anna.Schumaker@Netapp.com
>
上级
ad05cc0f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
28 addition
and
28 deletion
+28
-28
fs/nfs/nfs4proc.c
fs/nfs/nfs4proc.c
+28
-28
未找到文件。
fs/nfs/nfs4proc.c
浏览文件 @
d9b67e1e
...
...
@@ -2209,15 +2209,15 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover)
data
->
is_recover
=
1
;
}
task
=
rpc_run_task
(
&
task_setup_data
);
if
(
IS_ERR
(
task
))
return
PTR_ERR
(
task
);
status
=
nfs4_wait_for_completion_rpc_task
(
task
);
if
(
status
!=
0
)
{
data
->
cancelled
=
1
;
smp_wmb
();
}
else
status
=
data
->
rpc_status
;
rpc_put_task
(
task
);
if
(
IS_ERR
(
task
))
return
PTR_ERR
(
task
);
status
=
nfs4_wait_for_completion_rpc_task
(
task
);
if
(
status
!=
0
)
{
data
->
cancelled
=
1
;
smp_wmb
();
}
else
status
=
data
->
rpc_status
;
rpc_put_task
(
task
);
return
status
;
}
...
...
@@ -2226,7 +2226,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data)
{
struct
inode
*
dir
=
d_inode
(
data
->
dir
);
struct
nfs_openres
*
o_res
=
&
data
->
o_res
;
int
status
;
int
status
;
status
=
nfs4_run_open_task
(
data
,
1
);
if
(
status
!=
0
||
!
data
->
rpc_done
)
...
...
@@ -2860,12 +2860,12 @@ static int _nfs4_do_setattr(struct inode *inode,
struct
nfs_open_context
*
ctx
)
{
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
struct
rpc_message
msg
=
{
struct
rpc_message
msg
=
{
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_SETATTR
],
.
rpc_argp
=
arg
,
.
rpc_resp
=
res
,
.
rpc_cred
=
cred
,
};
};
struct
rpc_cred
*
delegation_cred
=
NULL
;
unsigned
long
timestamp
=
jiffies
;
fmode_t
fmode
;
...
...
@@ -2913,18 +2913,18 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
{
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
struct
nfs4_state
*
state
=
ctx
?
ctx
->
state
:
NULL
;
struct
nfs_setattrargs
arg
=
{
.
fh
=
NFS_FH
(
inode
),
.
iap
=
sattr
,
struct
nfs_setattrargs
arg
=
{
.
fh
=
NFS_FH
(
inode
),
.
iap
=
sattr
,
.
server
=
server
,
.
bitmask
=
server
->
attr_bitmask
,
.
label
=
ilabel
,
};
struct
nfs_setattrres
res
=
{
};
struct
nfs_setattrres
res
=
{
.
fattr
=
fattr
,
.
label
=
olabel
,
.
server
=
server
,
};
};
struct
nfs4_exception
exception
=
{
.
state
=
state
,
.
inode
=
inode
,
...
...
@@ -3038,7 +3038,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
}
}
/* hmm. we are done with the inode, and in the process of freeing
/* hmm. we are done with the inode, and in the process of freeing
* the state_owner. we keep this around to process errors
*/
switch
(
task
->
tk_status
)
{
...
...
@@ -4895,8 +4895,8 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
if
(
newpage
==
NULL
)
goto
unwind
;
memcpy
(
page_address
(
newpage
),
buf
,
len
);
buf
+=
len
;
buflen
-=
len
;
buf
+=
len
;
buflen
-=
len
;
*
pages
++
=
newpage
;
rc
++
;
}
while
(
buflen
!=
0
);
...
...
@@ -5219,8 +5219,8 @@ static int _nfs4_do_set_security_label(struct inode *inode,
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
const
u32
bitmask
[
3
]
=
{
0
,
0
,
FATTR4_WORD2_SECURITY_LABEL
};
struct
nfs_setattrargs
arg
=
{
.
fh
=
NFS_FH
(
inode
),
.
iap
=
&
sattr
,
.
fh
=
NFS_FH
(
inode
),
.
iap
=
&
sattr
,
.
server
=
server
,
.
bitmask
=
bitmask
,
.
label
=
ilabel
,
...
...
@@ -5231,9 +5231,9 @@ static int _nfs4_do_set_security_label(struct inode *inode,
.
server
=
server
,
};
struct
rpc_message
msg
=
{
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_SETATTR
],
.
rpc_argp
=
&
arg
,
.
rpc_resp
=
&
res
,
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_SETATTR
],
.
rpc_argp
=
&
arg
,
.
rpc_resp
=
&
res
,
};
int
status
;
...
...
@@ -5779,8 +5779,8 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
};
struct
rpc_message
msg
=
{
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_LOCKT
],
.
rpc_argp
=
&
arg
,
.
rpc_resp
=
&
res
,
.
rpc_argp
=
&
arg
,
.
rpc_resp
=
&
res
,
.
rpc_cred
=
state
->
owner
->
so_cred
,
};
struct
nfs4_lock_state
*
lsp
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录