Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FengXiao2002
Linux Imx
提交
7fcde0e3
L
Linux Imx
项目概览
FengXiao2002
/
Linux Imx
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
Linux Imx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7fcde0e3
编写于
4月 05, 2007
作者:
C
Chris Mason
提交者:
David Woodhouse
4月 05, 2007
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Btrfs: finish off inode indexing in dirs, add overflows
Signed-off-by:
N
Chris Mason
<
chris.mason@oracle.com
>
上级
5f26f772
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
107 addition
and
11 deletion
+107
-11
fs/btrfs/ctree.h
fs/btrfs/ctree.h
+33
-0
fs/btrfs/dir-item.c
fs/btrfs/dir-item.c
+69
-5
fs/btrfs/super.c
fs/btrfs/super.c
+5
-6
未找到文件。
fs/btrfs/ctree.h
浏览文件 @
7fcde0e3
...
...
@@ -270,6 +270,10 @@ struct btrfs_root {
#define BTRFS_KEY_TYPE_MAX 256
#define BTRFS_KEY_TYPE_MASK (BTRFS_KEY_TYPE_MAX - 1)
#define BTRFS_KEY_OVERFLOW_MAX 128
#define BTRFS_KEY_OVERFLOW_SHIFT 8
#define BTRFS_KEY_OVERFLOW_MASK (0x7FULL << BTRFS_KEY_OVERFLOW_SHIFT)
/*
* inode items have the data typically returned from stat and store other
* info about object characteristics. There is one for every file and dir in
...
...
@@ -588,6 +592,19 @@ static inline void btrfs_set_disk_key_flags(struct btrfs_disk_key *disk,
disk
->
flags
=
cpu_to_le32
(
val
);
}
static
inline
u32
btrfs_key_overflow
(
struct
btrfs_key
*
key
)
{
u32
over
=
key
->
flags
&
BTRFS_KEY_OVERFLOW_MASK
;
return
over
>>
BTRFS_KEY_OVERFLOW_SHIFT
;
}
static
inline
void
btrfs_set_key_overflow
(
struct
btrfs_key
*
key
,
u32
over
)
{
BUG_ON
(
over
>
BTRFS_KEY_OVERFLOW_MAX
);
over
=
over
<<
BTRFS_KEY_OVERFLOW_SHIFT
;
key
->
flags
=
(
key
->
flags
&
~
((
u64
)
BTRFS_KEY_OVERFLOW_MASK
))
|
over
;
}
static
inline
u32
btrfs_key_type
(
struct
btrfs_key
*
key
)
{
return
key
->
flags
&
BTRFS_KEY_TYPE_MASK
;
...
...
@@ -612,6 +629,22 @@ static inline void btrfs_set_disk_key_type(struct btrfs_disk_key *key, u32 type)
btrfs_set_disk_key_flags
(
key
,
flags
);
}
static
inline
u32
btrfs_disk_key_overflow
(
struct
btrfs_disk_key
*
key
)
{
u32
over
=
le32_to_cpu
(
key
->
flags
)
&
BTRFS_KEY_OVERFLOW_MASK
;
return
over
>>
BTRFS_KEY_OVERFLOW_SHIFT
;
}
static
inline
void
btrfs_set_disK_key_overflow
(
struct
btrfs_disk_key
*
key
,
u32
over
)
{
u32
flags
=
btrfs_disk_key_flags
(
key
);
BUG_ON
(
over
>
BTRFS_KEY_OVERFLOW_MAX
);
over
=
over
<<
BTRFS_KEY_OVERFLOW_SHIFT
;
flags
=
(
flags
&
~
((
u64
)
BTRFS_KEY_OVERFLOW_MASK
))
|
over
;
btrfs_set_disk_key_flags
(
key
,
flags
);
}
static
inline
u64
btrfs_header_blocknr
(
struct
btrfs_header
*
h
)
{
return
le64_to_cpu
(
h
->
blocknr
);
...
...
fs/btrfs/dir-item.c
浏览文件 @
7fcde0e3
...
...
@@ -4,6 +4,26 @@
#include "hash.h"
#include "transaction.h"
int
insert_with_overflow
(
struct
btrfs_trans_handle
*
trans
,
struct
btrfs_root
*
root
,
struct
btrfs_path
*
path
,
struct
btrfs_key
*
cpu_key
,
u32
data_size
)
{
int
overflow
;
int
ret
;
ret
=
btrfs_insert_empty_item
(
trans
,
root
,
path
,
cpu_key
,
data_size
);
overflow
=
btrfs_key_overflow
(
cpu_key
);
while
(
ret
==
-
EEXIST
&&
overflow
<
BTRFS_KEY_OVERFLOW_MAX
)
{
overflow
++
;
btrfs_set_key_overflow
(
cpu_key
,
overflow
);
btrfs_release_path
(
root
,
path
);
ret
=
btrfs_insert_empty_item
(
trans
,
root
,
path
,
cpu_key
,
data_size
);
}
return
ret
;
}
int
btrfs_insert_dir_item
(
struct
btrfs_trans_handle
*
trans
,
struct
btrfs_root
*
root
,
const
char
*
name
,
int
name_len
,
u64
dir
,
u64
objectid
,
u8
type
)
...
...
@@ -23,7 +43,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
path
=
btrfs_alloc_path
();
btrfs_init_path
(
path
);
data_size
=
sizeof
(
*
dir_item
)
+
name_len
;
ret
=
btrfs_insert_empty_item
(
trans
,
root
,
path
,
&
key
,
data_size
);
ret
=
insert_with_overflow
(
trans
,
root
,
path
,
&
key
,
data_size
);
if
(
ret
)
goto
out
;
...
...
@@ -41,7 +61,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_key_type
(
&
key
,
BTRFS_DIR_INDEX_KEY
);
key
.
offset
=
objectid
;
ret
=
btrfs_insert_empty_item
(
trans
,
root
,
path
,
&
key
,
data_size
);
ret
=
insert_with_overflow
(
trans
,
root
,
path
,
&
key
,
data_size
);
// FIXME clear the dirindex bit
if
(
ret
)
goto
out
;
...
...
@@ -70,14 +90,40 @@ int btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
struct
btrfs_key
key
;
int
ins_len
=
mod
<
0
?
-
1
:
0
;
int
cow
=
mod
!=
0
;
struct
btrfs_disk_key
*
found_key
;
struct
btrfs_leaf
*
leaf
;
key
.
objectid
=
dir
;
key
.
flags
=
0
;
btrfs_set_key_type
(
&
key
,
BTRFS_DIR_ITEM_KEY
);
btrfs_set_key_overflow
(
&
key
,
BTRFS_KEY_OVERFLOW_MAX
-
1
);
ret
=
btrfs_name_hash
(
name
,
name_len
,
&
key
.
offset
);
BUG_ON
(
ret
);
while
(
1
)
{
ret
=
btrfs_search_slot
(
trans
,
root
,
&
key
,
path
,
ins_len
,
cow
);
if
(
ret
<
0
)
return
ret
;
if
(
ret
>
0
)
{
if
(
path
->
slots
[
0
]
==
0
)
return
1
;
path
->
slots
[
0
]
--
;
}
leaf
=
btrfs_buffer_leaf
(
path
->
nodes
[
0
]);
found_key
=
&
leaf
->
items
[
path
->
slots
[
0
]].
key
;
if
(
btrfs_disk_key_objectid
(
found_key
)
!=
dir
||
btrfs_disk_key_type
(
found_key
)
!=
BTRFS_DIR_ITEM_KEY
||
btrfs_disk_key_offset
(
found_key
)
!=
key
.
offset
)
return
1
;
if
(
btrfs_match_dir_item_name
(
root
,
path
,
name
,
name_len
))
return
0
;
if
(
btrfs_disk_key_overflow
(
found_key
)
==
0
)
return
1
;
btrfs_release_path
(
root
,
path
);
}
return
1
;
}
int
btrfs_lookup_dir_index_item
(
struct
btrfs_trans_handle
*
trans
,
...
...
@@ -89,13 +135,31 @@ int btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans,
struct
btrfs_key
key
;
int
ins_len
=
mod
<
0
?
-
1
:
0
;
int
cow
=
mod
!=
0
;
struct
btrfs_disk_key
*
found_key
;
struct
btrfs_leaf
*
leaf
;
key
.
objectid
=
dir
;
key
.
flags
=
0
;
btrfs_set_key_type
(
&
key
,
BTRFS_DIR_INDEX_KEY
);
btrfs_set_key_overflow
(
&
key
,
BTRFS_KEY_OVERFLOW_MAX
-
1
);
key
.
offset
=
objectid
;
ret
=
btrfs_search_slot
(
trans
,
root
,
&
key
,
path
,
ins_len
,
cow
);
if
(
ret
<
0
)
return
ret
;
if
(
ret
>
0
)
{
if
(
path
->
slots
[
0
]
==
0
)
return
1
;
path
->
slots
[
0
]
--
;
}
leaf
=
btrfs_buffer_leaf
(
path
->
nodes
[
0
]);
found_key
=
&
leaf
->
items
[
path
->
slots
[
0
]].
key
;
if
(
btrfs_disk_key_objectid
(
found_key
)
!=
dir
||
btrfs_disk_key_type
(
found_key
)
!=
BTRFS_DIR_INDEX_KEY
)
return
1
;
if
(
btrfs_disk_key_offset
(
found_key
)
==
objectid
)
return
0
;
return
1
;
}
int
btrfs_match_dir_item_name
(
struct
btrfs_root
*
root
,
...
...
fs/btrfs/super.c
浏览文件 @
7fcde0e3
...
...
@@ -486,19 +486,18 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
continue
;
if
(
btrfs_disk_key_offset
(
&
item
->
key
)
<
filp
->
f_pos
)
continue
;
filp
->
f_pos
=
btrfs_disk_key_offset
(
&
item
->
key
);
advance
=
1
;
di
=
btrfs_item_ptr
(
leaf
,
slot
,
struct
btrfs_dir_item
);
over
=
filldir
(
dirent
,
(
const
char
*
)(
di
+
1
),
btrfs_dir_name_len
(
di
),
btrfs_disk_key_offset
(
&
item
->
key
),
btrfs_dir_objectid
(
di
),
d_type
);
if
(
over
)
{
filp
->
f_pos
=
btrfs_disk_key_offset
(
&
item
->
key
);
break
;
}
filp
->
f_pos
=
btrfs_disk_key_offset
(
&
item
->
key
)
+
1
;
if
(
over
)
goto
nopos
;
}
filp
->
f_pos
++
;
nopos:
ret
=
0
;
err:
btrfs_release_path
(
root
,
path
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录