Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
1b1e2135
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1b1e2135
编写于
6月 25, 2008
作者:
C
Chris Mason
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Btrfs: Add a per-inode csum mutex to avoid races creating csum items
Signed-off-by:
N
Chris Mason
<
chris.mason@oracle.com
>
上级
079899c2
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
6 deletion
+21
-6
fs/btrfs/btrfs_inode.h
fs/btrfs/btrfs_inode.h
+1
-0
fs/btrfs/file.c
fs/btrfs/file.c
+3
-3
fs/btrfs/inode.c
fs/btrfs/inode.c
+6
-0
fs/btrfs/ordered-data.c
fs/btrfs/ordered-data.c
+3
-2
fs/btrfs/transaction.c
fs/btrfs/transaction.c
+1
-1
fs/btrfs/tree-defrag.c
fs/btrfs/tree-defrag.c
+7
-0
未找到文件。
fs/btrfs/btrfs_inode.h
浏览文件 @
1b1e2135
...
...
@@ -30,6 +30,7 @@ struct btrfs_inode {
struct
extent_map_tree
extent_tree
;
struct
extent_io_tree
io_tree
;
struct
extent_io_tree
io_failure_tree
;
struct
mutex
csum_mutex
;
struct
inode
vfs_inode
;
atomic_t
ordered_writeback
;
...
...
fs/btrfs/file.c
浏览文件 @
1b1e2135
...
...
@@ -267,13 +267,13 @@ static int noinline dirty_and_release_pages(struct btrfs_trans_handle *trans,
/* FIXME...EIEIO, ENOSPC and more */
/* insert any holes we need to create */
if
(
isize
<
end
_pos
)
{
if
(
isize
<
start
_pos
)
{
u64
last_pos_in_file
;
u64
hole_size
;
u64
mask
=
root
->
sectorsize
-
1
;
last_pos_in_file
=
(
isize
+
mask
)
&
~
mask
;
hole_size
=
(
end
_pos
-
last_pos_in_file
+
mask
)
&
~
mask
;
if
(
last_pos_in_file
<
end
_pos
)
{
hole_size
=
(
start
_pos
-
last_pos_in_file
+
mask
)
&
~
mask
;
if
(
last_pos_in_file
<
start
_pos
)
{
err
=
btrfs_drop_extents
(
trans
,
root
,
inode
,
last_pos_in_file
,
last_pos_in_file
+
hole_size
,
...
...
fs/btrfs/inode.c
浏览文件 @
1b1e2135
...
...
@@ -351,7 +351,9 @@ int __btrfs_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,
trans
=
btrfs_start_transaction
(
root
,
1
);
btrfs_set_trans_block_group
(
trans
,
inode
);
mutex_lock
(
&
BTRFS_I
(
inode
)
->
csum_mutex
);
btrfs_csum_file_blocks
(
trans
,
root
,
inode
,
bio
,
sums
);
mutex_unlock
(
&
BTRFS_I
(
inode
)
->
csum_mutex
);
ret
=
btrfs_end_transaction
(
trans
,
root
);
BUG_ON
(
ret
);
...
...
@@ -1400,6 +1402,7 @@ static int btrfs_init_locked_inode(struct inode *inode, void *p)
inode
->
i_mapping
,
GFP_NOFS
);
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
inode
->
i_mapping
,
GFP_NOFS
);
mutex_init
(
&
BTRFS_I
(
inode
)
->
csum_mutex
);
atomic_set
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
,
0
);
return
0
;
}
...
...
@@ -1701,6 +1704,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
inode
->
i_mapping
,
GFP_NOFS
);
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
inode
->
i_mapping
,
GFP_NOFS
);
mutex_init
(
&
BTRFS_I
(
inode
)
->
csum_mutex
);
atomic_set
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
,
0
);
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
BTRFS_I
(
inode
)
->
root
=
root
;
...
...
@@ -1924,6 +1928,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
inode
->
i_mapping
,
GFP_NOFS
);
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
inode
->
i_mapping
,
GFP_NOFS
);
mutex_init
(
&
BTRFS_I
(
inode
)
->
csum_mutex
);
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
atomic_set
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
,
0
);
BTRFS_I
(
inode
)
->
io_tree
.
ops
=
&
btrfs_extent_io_ops
;
...
...
@@ -2862,6 +2867,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
inode
->
i_mapping
,
GFP_NOFS
);
extent_io_tree_init
(
&
BTRFS_I
(
inode
)
->
io_failure_tree
,
inode
->
i_mapping
,
GFP_NOFS
);
mutex_init
(
&
BTRFS_I
(
inode
)
->
csum_mutex
);
BTRFS_I
(
inode
)
->
delalloc_bytes
=
0
;
atomic_set
(
&
BTRFS_I
(
inode
)
->
ordered_writeback
,
0
);
BTRFS_I
(
inode
)
->
io_tree
.
ops
=
&
btrfs_extent_io_ops
;
...
...
fs/btrfs/ordered-data.c
浏览文件 @
1b1e2135
...
...
@@ -152,12 +152,13 @@ int btrfs_add_ordered_inode(struct inode *inode)
inode
->
i_ino
,
&
entry
->
rb_node
);
BTRFS_I
(
inode
)
->
ordered_trans
=
transid
;
if
(
!
node
)
igrab
(
inode
);
write_unlock
(
&
tree
->
lock
);
if
(
node
)
kfree
(
entry
);
else
igrab
(
inode
);
return
0
;
}
...
...
fs/btrfs/transaction.c
浏览文件 @
1b1e2135
...
...
@@ -477,7 +477,7 @@ static noinline int drop_dirty_roots(struct btrfs_root *tree_root,
if
(
err
)
ret
=
err
;
nr
=
trans
->
blocks_used
;
ret
=
btrfs_end_transaction
(
trans
,
tree_root
);
ret
=
btrfs_end_transaction
_throttle
(
trans
,
tree_root
);
BUG_ON
(
ret
);
mutex_unlock
(
&
root
->
fs_info
->
drop_mutex
);
...
...
fs/btrfs/tree-defrag.c
浏览文件 @
1b1e2135
...
...
@@ -38,8 +38,15 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
u64
last_ret
=
0
;
if
(
root
->
fs_info
->
extent_root
==
root
)
{
/*
* there's recursion here right now in the tree locking,
* we can't defrag the extent root without deadlock
*/
goto
out
;
#if 0
mutex_lock(&root->fs_info->alloc_mutex);
is_extent = 1;
#endif
}
if
(
root
->
ref_cows
==
0
&&
!
is_extent
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录