Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
303a8f2a
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
303a8f2a
编写于
11月 25, 2011
作者:
C
Cong Wang
提交者:
Cong Wang
3月 20, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jbd2: remove the second argument of k[un]map_atomic()
Signed-off-by:
N
Cong Wang
<
amwang@redhat.com
>
上级
8fb53c46
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
10 addition
and
10 deletion
+10
-10
fs/jbd2/commit.c
fs/jbd2/commit.c
+2
-2
fs/jbd2/journal.c
fs/jbd2/journal.c
+6
-6
fs/jbd2/transaction.c
fs/jbd2/transaction.c
+2
-2
未找到文件。
fs/jbd2/commit.c
浏览文件 @
303a8f2a
...
...
@@ -286,10 +286,10 @@ static __u32 jbd2_checksum_data(__u32 crc32_sum, struct buffer_head *bh)
char
*
addr
;
__u32
checksum
;
addr
=
kmap_atomic
(
page
,
KM_USER0
);
addr
=
kmap_atomic
(
page
);
checksum
=
crc32_be
(
crc32_sum
,
(
void
*
)(
addr
+
offset_in_page
(
bh
->
b_data
)),
bh
->
b_size
);
kunmap_atomic
(
addr
,
KM_USER0
);
kunmap_atomic
(
addr
);
return
checksum
;
}
...
...
fs/jbd2/journal.c
浏览文件 @
303a8f2a
...
...
@@ -345,7 +345,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
new_offset
=
offset_in_page
(
jh2bh
(
jh_in
)
->
b_data
);
}
mapped_data
=
kmap_atomic
(
new_page
,
KM_USER0
);
mapped_data
=
kmap_atomic
(
new_page
);
/*
* Fire data frozen trigger if data already wasn't frozen. Do this
* before checking for escaping, as the trigger may modify the magic
...
...
@@ -364,7 +364,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
need_copy_out
=
1
;
do_escape
=
1
;
}
kunmap_atomic
(
mapped_data
,
KM_USER0
);
kunmap_atomic
(
mapped_data
);
/*
* Do we need to do a data copy?
...
...
@@ -385,9 +385,9 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
}
jh_in
->
b_frozen_data
=
tmp
;
mapped_data
=
kmap_atomic
(
new_page
,
KM_USER0
);
mapped_data
=
kmap_atomic
(
new_page
);
memcpy
(
tmp
,
mapped_data
+
new_offset
,
jh2bh
(
jh_in
)
->
b_size
);
kunmap_atomic
(
mapped_data
,
KM_USER0
);
kunmap_atomic
(
mapped_data
);
new_page
=
virt_to_page
(
tmp
);
new_offset
=
offset_in_page
(
tmp
);
...
...
@@ -406,9 +406,9 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
* copying, we can finally do so.
*/
if
(
do_escape
)
{
mapped_data
=
kmap_atomic
(
new_page
,
KM_USER0
);
mapped_data
=
kmap_atomic
(
new_page
);
*
((
unsigned
int
*
)(
mapped_data
+
new_offset
))
=
0
;
kunmap_atomic
(
mapped_data
,
KM_USER0
);
kunmap_atomic
(
mapped_data
);
}
set_bh_page
(
new_bh
,
new_page
,
new_offset
);
...
...
fs/jbd2/transaction.c
浏览文件 @
303a8f2a
...
...
@@ -783,12 +783,12 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
"Possible IO failure.
\n
"
);
page
=
jh2bh
(
jh
)
->
b_page
;
offset
=
offset_in_page
(
jh2bh
(
jh
)
->
b_data
);
source
=
kmap_atomic
(
page
,
KM_USER0
);
source
=
kmap_atomic
(
page
);
/* Fire data frozen trigger just before we copy the data */
jbd2_buffer_frozen_trigger
(
jh
,
source
+
offset
,
jh
->
b_triggers
);
memcpy
(
jh
->
b_frozen_data
,
source
+
offset
,
jh2bh
(
jh
)
->
b_size
);
kunmap_atomic
(
source
,
KM_USER0
);
kunmap_atomic
(
source
);
/*
* Now that the frozen data is saved off, we need to store
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录