Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
9d9e7ba9
R
raspberrypi-kernel
项目概览
openeuler
/
raspberrypi-kernel
通知
13
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
raspberrypi-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
9d9e7ba9
编写于
8年前
作者:
M
Mike Marshall
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Orangefs: improve gossip statements
Signed-off-by:
N
Mike Marshall
<
hubcap@omnibond.com
>
上级
9f08cfe9
无相关合并请求
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
49 addition
and
21 deletion
+49
-21
fs/orangefs/devorangefs-req.c
fs/orangefs/devorangefs-req.c
+18
-0
fs/orangefs/file.c
fs/orangefs/file.c
+2
-6
fs/orangefs/orangefs-mod.c
fs/orangefs/orangefs-mod.c
+6
-5
fs/orangefs/waitqueue.c
fs/orangefs/waitqueue.c
+23
-10
未找到文件。
fs/orangefs/devorangefs-req.c
浏览文件 @
9d9e7ba9
...
...
@@ -245,6 +245,12 @@ static ssize_t orangefs_devreq_read(struct file *file,
* it has been sent to the client.
*/
set_op_state_inprogress
(
cur_op
);
gossip_debug
(
GOSSIP_DEV_DEBUG
,
"%s: 1 op:%s: op_state:%d: process:%s:
\n
"
,
__func__
,
get_opname_string
(
cur_op
),
cur_op
->
op_state
,
current
->
comm
);
orangefs_devreq_add_op
(
cur_op
);
spin_unlock
(
&
cur_op
->
lock
);
spin_unlock
(
&
htable_ops_in_progress_lock
);
...
...
@@ -262,6 +268,12 @@ static ssize_t orangefs_devreq_read(struct file *file,
spin_lock
(
&
cur_op
->
lock
);
if
(
likely
(
!
op_state_given_up
(
cur_op
)))
{
set_op_state_waiting
(
cur_op
);
gossip_debug
(
GOSSIP_DEV_DEBUG
,
"%s: 2 op:%s: op_state:%d: process:%s:
\n
"
,
__func__
,
get_opname_string
(
cur_op
),
cur_op
->
op_state
,
current
->
comm
);
list_add
(
&
cur_op
->
list
,
&
orangefs_request_list
);
spin_unlock
(
&
cur_op
->
lock
);
}
else
{
...
...
@@ -416,6 +428,12 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb,
complete
(
&
op
->
waitq
);
}
else
{
set_op_state_serviced
(
op
);
gossip_debug
(
GOSSIP_DEV_DEBUG
,
"%s: op:%s: op_state:%d: process:%s:
\n
"
,
__func__
,
get_opname_string
(
op
),
op
->
op_state
,
current
->
comm
);
spin_unlock
(
&
op
->
lock
);
}
return
ret
;
...
...
This diff is collapsed.
Click to expand it.
fs/orangefs/file.c
浏览文件 @
9d9e7ba9
...
...
@@ -214,18 +214,14 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod
goto
out
;
}
gossip_debug
(
GOSSIP_FILE_DEBUG
,
"%s(%pU): Amount
written as
returned by the sys-io call:%d
\n
"
,
"%s(%pU): Amount
%s,
returned by the sys-io call:%d
\n
"
,
__func__
,
handle
,
type
==
ORANGEFS_IO_READ
?
"read"
:
"written"
,
(
int
)
new_op
->
downcall
.
resp
.
io
.
amt_complete
);
ret
=
new_op
->
downcall
.
resp
.
io
.
amt_complete
;
/*
* tell the device file owner waiting on I/O that this read has
* completed and it can return now.
*/
out:
if
(
buffer_index
>=
0
)
{
orangefs_bufmap_put
(
buffer_index
);
...
...
This diff is collapsed.
Click to expand it.
fs/orangefs/orangefs-mod.c
浏览文件 @
9d9e7ba9
...
...
@@ -261,12 +261,13 @@ void purge_inprogress_ops(void)
next
,
&
htable_ops_in_progress
[
i
],
list
)
{
gossip_debug
(
GOSSIP_INIT_DEBUG
,
"pvfs2-client-core: purging in-progress op tag "
"%llu %s
\n
"
,
llu
(
op
->
tag
),
get_opname_string
(
op
));
set_op_state_purged
(
op
);
gossip_debug
(
GOSSIP_DEV_DEBUG
,
"%s: op:%s: op_state:%d: process:%s:
\n
"
,
__func__
,
get_opname_string
(
op
),
op
->
op_state
,
current
->
comm
);
}
spin_unlock
(
&
htable_ops_in_progress_lock
);
}
...
...
This diff is collapsed.
Click to expand it.
fs/orangefs/waitqueue.c
浏览文件 @
9d9e7ba9
...
...
@@ -37,6 +37,12 @@ void purge_waiting_ops(void)
llu
(
op
->
tag
),
get_opname_string
(
op
));
set_op_state_purged
(
op
);
gossip_debug
(
GOSSIP_DEV_DEBUG
,
"%s: op:%s: op_state:%d: process:%s:
\n
"
,
__func__
,
get_opname_string
(
op
),
op
->
op_state
,
current
->
comm
);
}
spin_unlock
(
&
orangefs_request_list_lock
);
}
...
...
@@ -101,6 +107,12 @@ int service_operation(struct orangefs_kernel_op_s *op,
spin_lock
(
&
orangefs_request_list_lock
);
spin_lock
(
&
op
->
lock
);
set_op_state_waiting
(
op
);
gossip_debug
(
GOSSIP_DEV_DEBUG
,
"%s: op:%s: op_state:%d: process:%s:
\n
"
,
__func__
,
get_opname_string
(
op
),
op
->
op_state
,
current
->
comm
);
/* add high priority remount op to the front of the line. */
if
(
flags
&
ORANGEFS_OP_PRIORITY
)
list_add
(
&
op
->
list
,
&
orangefs_request_list
);
...
...
@@ -173,7 +185,8 @@ int service_operation(struct orangefs_kernel_op_s *op,
out:
gossip_debug
(
GOSSIP_WAIT_DEBUG
,
"orangefs: service_operation %s returning: %d for %p.
\n
"
,
"%s: %s returning: %d for %p.
\n
"
,
__func__
,
op_name
,
ret
,
op
);
...
...
@@ -204,6 +217,12 @@ bool orangefs_cancel_op_in_progress(struct orangefs_kernel_op_s *op)
}
spin_lock
(
&
op
->
lock
);
set_op_state_waiting
(
op
);
gossip_debug
(
GOSSIP_DEV_DEBUG
,
"%s: op:%s: op_state:%d: process:%s:
\n
"
,
__func__
,
get_opname_string
(
op
),
op
->
op_state
,
current
->
comm
);
list_add
(
&
op
->
list
,
&
orangefs_request_list
);
spin_unlock
(
&
op
->
lock
);
spin_unlock
(
&
orangefs_request_list_lock
);
...
...
@@ -310,9 +329,7 @@ static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
if
(
unlikely
(
n
<
0
))
{
gossip_debug
(
GOSSIP_WAIT_DEBUG
,
"*** %s:"
" operation interrupted by a signal (tag "
"%llu, op %p)
\n
"
,
"%s: operation interrupted, tag %llu, %p
\n
"
,
__func__
,
llu
(
op
->
tag
),
op
);
...
...
@@ -320,9 +337,7 @@ static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
}
if
(
op_state_purged
(
op
))
{
gossip_debug
(
GOSSIP_WAIT_DEBUG
,
"*** %s:"
" operation purged (tag "
"%llu, %p, att %d)
\n
"
,
"%s: operation purged, tag %llu, %p, %d
\n
"
,
__func__
,
llu
(
op
->
tag
),
op
,
...
...
@@ -333,9 +348,7 @@ static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
}
/* must have timed out, then... */
gossip_debug
(
GOSSIP_WAIT_DEBUG
,
"*** %s:"
" operation timed out (tag"
" %llu, %p, att %d)
\n
"
,
"%s: operation timed out, tag %llu, %p, %d)
\n
"
,
__func__
,
llu
(
op
->
tag
),
op
,
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部