Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
c71dd880
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看板
提交
c71dd880
编写于
3月 20, 2019
作者:
D
David Sterba
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
btrfs: remove unused parameter fs_info from btrfs_extend_item
Signed-off-by:
N
David Sterba
<
dsterba@suse.com
>
上级
78ac4f9e
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
12 addition
and
17 deletion
+12
-17
fs/btrfs/ctree.c
fs/btrfs/ctree.c
+2
-3
fs/btrfs/ctree.h
fs/btrfs/ctree.h
+1
-2
fs/btrfs/dir-item.c
fs/btrfs/dir-item.c
+1
-1
fs/btrfs/extent-tree.c
fs/btrfs/extent-tree.c
+1
-1
fs/btrfs/file-item.c
fs/btrfs/file-item.c
+1
-1
fs/btrfs/inode-item.c
fs/btrfs/inode-item.c
+2
-2
fs/btrfs/tree-log.c
fs/btrfs/tree-log.c
+1
-3
fs/btrfs/uuid-tree.c
fs/btrfs/uuid-tree.c
+1
-1
fs/btrfs/xattr.c
fs/btrfs/xattr.c
+2
-3
未找到文件。
fs/btrfs/ctree.c
浏览文件 @
c71dd880
...
...
@@ -4639,8 +4639,7 @@ void btrfs_truncate_item(struct btrfs_path *path, u32 new_size, int from_end)
/*
* make the item pointed to by the path bigger, data_size is the added size.
*/
void
btrfs_extend_item
(
struct
btrfs_fs_info
*
fs_info
,
struct
btrfs_path
*
path
,
u32
data_size
)
void
btrfs_extend_item
(
struct
btrfs_path
*
path
,
u32
data_size
)
{
int
slot
;
struct
extent_buffer
*
leaf
;
...
...
@@ -4669,7 +4668,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
BUG_ON
(
slot
<
0
);
if
(
slot
>=
nritems
)
{
btrfs_print_leaf
(
leaf
);
btrfs_crit
(
fs_info
,
"slot %d too large, nritems %d"
,
btrfs_crit
(
leaf
->
fs_info
,
"slot %d too large, nritems %d"
,
slot
,
nritems
);
BUG
();
}
...
...
fs/btrfs/ctree.h
浏览文件 @
c71dd880
...
...
@@ -2930,8 +2930,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
struct
extent_buffer
**
cow_ret
,
u64
new_root_objectid
);
int
btrfs_block_can_be_shared
(
struct
btrfs_root
*
root
,
struct
extent_buffer
*
buf
);
void
btrfs_extend_item
(
struct
btrfs_fs_info
*
fs_info
,
struct
btrfs_path
*
path
,
u32
data_size
);
void
btrfs_extend_item
(
struct
btrfs_path
*
path
,
u32
data_size
);
void
btrfs_truncate_item
(
struct
btrfs_path
*
path
,
u32
new_size
,
int
from_end
);
int
btrfs_split_item
(
struct
btrfs_trans_handle
*
trans
,
struct
btrfs_root
*
root
,
...
...
fs/btrfs/dir-item.c
浏览文件 @
c71dd880
...
...
@@ -36,7 +36,7 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
di
=
btrfs_match_dir_item_name
(
fs_info
,
path
,
name
,
name_len
);
if
(
di
)
return
ERR_PTR
(
-
EEXIST
);
btrfs_extend_item
(
fs_info
,
path
,
data_size
);
btrfs_extend_item
(
path
,
data_size
);
}
else
if
(
ret
<
0
)
return
ERR_PTR
(
ret
);
WARN_ON
(
ret
>
0
);
...
...
fs/btrfs/extent-tree.c
浏览文件 @
c71dd880
...
...
@@ -1705,7 +1705,7 @@ void setup_inline_extent_backref(struct btrfs_fs_info *fs_info,
type
=
extent_ref_type
(
parent
,
owner
);
size
=
btrfs_extent_inline_ref_size
(
type
);
btrfs_extend_item
(
fs_info
,
path
,
size
);
btrfs_extend_item
(
path
,
size
);
ei
=
btrfs_item_ptr
(
leaf
,
path
->
slots
[
0
],
struct
btrfs_extent_item
);
refs
=
btrfs_extent_refs
(
leaf
,
ei
);
...
...
fs/btrfs/file-item.c
浏览文件 @
c71dd880
...
...
@@ -848,7 +848,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
diff
/=
csum_size
;
diff
*=
csum_size
;
btrfs_extend_item
(
fs_info
,
path
,
diff
);
btrfs_extend_item
(
path
,
diff
);
ret
=
0
;
goto
csum
;
}
...
...
fs/btrfs/inode-item.c
浏览文件 @
c71dd880
...
...
@@ -288,7 +288,7 @@ static int btrfs_insert_inode_extref(struct btrfs_trans_handle *trans,
name
,
name_len
,
NULL
))
goto
out
;
btrfs_extend_item
(
root
->
fs_info
,
path
,
ins_len
);
btrfs_extend_item
(
path
,
ins_len
);
ret
=
0
;
}
if
(
ret
<
0
)
...
...
@@ -347,7 +347,7 @@ int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans,
goto
out
;
old_size
=
btrfs_item_size_nr
(
path
->
nodes
[
0
],
path
->
slots
[
0
]);
btrfs_extend_item
(
fs_info
,
path
,
ins_len
);
btrfs_extend_item
(
path
,
ins_len
);
ref
=
btrfs_item_ptr
(
path
->
nodes
[
0
],
path
->
slots
[
0
],
struct
btrfs_inode_ref
);
ref
=
(
struct
btrfs_inode_ref
*
)((
unsigned
long
)
ref
+
old_size
);
...
...
fs/btrfs/tree-log.c
浏览文件 @
c71dd880
...
...
@@ -344,7 +344,6 @@ static noinline int overwrite_item(struct btrfs_trans_handle *trans,
struct
extent_buffer
*
eb
,
int
slot
,
struct
btrfs_key
*
key
)
{
struct
btrfs_fs_info
*
fs_info
=
root
->
fs_info
;
int
ret
;
u32
item_size
;
u64
saved_i_size
=
0
;
...
...
@@ -467,8 +466,7 @@ static noinline int overwrite_item(struct btrfs_trans_handle *trans,
if
(
found_size
>
item_size
)
btrfs_truncate_item
(
path
,
item_size
,
1
);
else
if
(
found_size
<
item_size
)
btrfs_extend_item
(
fs_info
,
path
,
item_size
-
found_size
);
btrfs_extend_item
(
path
,
item_size
-
found_size
);
}
else
if
(
ret
)
{
return
ret
;
}
...
...
fs/btrfs/uuid-tree.c
浏览文件 @
c71dd880
...
...
@@ -121,7 +121,7 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,
* An item with that type already exists.
* Extend the item and store the new subid at the end.
*/
btrfs_extend_item
(
fs_info
,
path
,
sizeof
(
subid_le
));
btrfs_extend_item
(
path
,
sizeof
(
subid_le
));
eb
=
path
->
nodes
[
0
];
slot
=
path
->
slots
[
0
];
offset
=
btrfs_item_ptr_offset
(
eb
,
slot
);
...
...
fs/btrfs/xattr.c
浏览文件 @
c71dd880
...
...
@@ -185,8 +185,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
if
(
old_data_len
+
name_len
+
sizeof
(
*
di
)
==
item_size
)
{
/* No other xattrs packed in the same leaf item. */
if
(
size
>
old_data_len
)
btrfs_extend_item
(
fs_info
,
path
,
size
-
old_data_len
);
btrfs_extend_item
(
path
,
size
-
old_data_len
);
else
if
(
size
<
old_data_len
)
btrfs_truncate_item
(
path
,
data_size
,
1
);
}
else
{
...
...
@@ -194,7 +193,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
ret
=
btrfs_delete_one_dir_name
(
trans
,
root
,
path
,
di
);
if
(
ret
)
goto
out
;
btrfs_extend_item
(
fs_info
,
path
,
data_size
);
btrfs_extend_item
(
path
,
data_size
);
}
item
=
btrfs_item_nr
(
slot
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录