Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
cb7a9341
K
Kernel
项目概览
openeuler
/
Kernel
接近 2 年 前同步成功
通知
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看板
提交
cb7a9341
编写于
9月 03, 2010
作者:
A
Alex Elder
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '2.6.36-xfs-misc' of
git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev
上级
9af25465
72656c46
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
11 deletion
+11
-11
fs/xfs/linux-2.6/xfs_buf.c
fs/xfs/linux-2.6/xfs_buf.c
+1
-7
fs/xfs/linux-2.6/xfs_buf.h
fs/xfs/linux-2.6/xfs_buf.h
+0
-1
fs/xfs/xfs_vnodeops.c
fs/xfs/xfs_vnodeops.c
+10
-3
未找到文件。
fs/xfs/linux-2.6/xfs_buf.c
浏览文件 @
cb7a9341
...
@@ -440,12 +440,7 @@ _xfs_buf_find(
...
@@ -440,12 +440,7 @@ _xfs_buf_find(
ASSERT
(
btp
==
bp
->
b_target
);
ASSERT
(
btp
==
bp
->
b_target
);
if
(
bp
->
b_file_offset
==
range_base
&&
if
(
bp
->
b_file_offset
==
range_base
&&
bp
->
b_buffer_length
==
range_length
)
{
bp
->
b_buffer_length
==
range_length
)
{
/*
* If we look at something, bring it to the
* front of the list for next time.
*/
atomic_inc
(
&
bp
->
b_hold
);
atomic_inc
(
&
bp
->
b_hold
);
list_move
(
&
bp
->
b_hash_list
,
&
hash
->
bh_list
);
goto
found
;
goto
found
;
}
}
}
}
...
@@ -1443,8 +1438,7 @@ xfs_alloc_bufhash(
...
@@ -1443,8 +1438,7 @@ xfs_alloc_bufhash(
{
{
unsigned
int
i
;
unsigned
int
i
;
btp
->
bt_hashshift
=
external
?
3
:
8
;
/* 8 or 256 buckets */
btp
->
bt_hashshift
=
external
?
3
:
12
;
/* 8 or 4096 buckets */
btp
->
bt_hashmask
=
(
1
<<
btp
->
bt_hashshift
)
-
1
;
btp
->
bt_hash
=
kmem_zalloc_large
((
1
<<
btp
->
bt_hashshift
)
*
btp
->
bt_hash
=
kmem_zalloc_large
((
1
<<
btp
->
bt_hashshift
)
*
sizeof
(
xfs_bufhash_t
));
sizeof
(
xfs_bufhash_t
));
for
(
i
=
0
;
i
<
(
1
<<
btp
->
bt_hashshift
);
i
++
)
{
for
(
i
=
0
;
i
<
(
1
<<
btp
->
bt_hashshift
);
i
++
)
{
...
...
fs/xfs/linux-2.6/xfs_buf.h
浏览文件 @
cb7a9341
...
@@ -137,7 +137,6 @@ typedef struct xfs_buftarg {
...
@@ -137,7 +137,6 @@ typedef struct xfs_buftarg {
size_t
bt_smask
;
size_t
bt_smask
;
/* per device buffer hash table */
/* per device buffer hash table */
uint
bt_hashmask
;
uint
bt_hashshift
;
uint
bt_hashshift
;
xfs_bufhash_t
*
bt_hash
;
xfs_bufhash_t
*
bt_hash
;
...
...
fs/xfs/xfs_vnodeops.c
浏览文件 @
cb7a9341
...
@@ -2299,15 +2299,22 @@ xfs_alloc_file_space(
...
@@ -2299,15 +2299,22 @@ xfs_alloc_file_space(
e
=
allocatesize_fsb
;
e
=
allocatesize_fsb
;
}
}
/*
* The transaction reservation is limited to a 32-bit block
* count, hence we need to limit the number of blocks we are
* trying to reserve to avoid an overflow. We can't allocate
* more than @nimaps extents, and an extent is limited on disk
* to MAXEXTLEN (21 bits), so use that to enforce the limit.
*/
resblks
=
min_t
(
xfs_fileoff_t
,
(
e
-
s
),
(
MAXEXTLEN
*
nimaps
));
if
(
unlikely
(
rt
))
{
if
(
unlikely
(
rt
))
{
resrtextents
=
qblocks
=
(
uint
)(
e
-
s
)
;
resrtextents
=
qblocks
=
resblks
;
resrtextents
/=
mp
->
m_sb
.
sb_rextsize
;
resrtextents
/=
mp
->
m_sb
.
sb_rextsize
;
resblks
=
XFS_DIOSTRAT_SPACE_RES
(
mp
,
0
);
resblks
=
XFS_DIOSTRAT_SPACE_RES
(
mp
,
0
);
quota_flag
=
XFS_QMOPT_RES_RTBLKS
;
quota_flag
=
XFS_QMOPT_RES_RTBLKS
;
}
else
{
}
else
{
resrtextents
=
0
;
resrtextents
=
0
;
resblks
=
qblocks
=
\
resblks
=
qblocks
=
XFS_DIOSTRAT_SPACE_RES
(
mp
,
resblks
);
XFS_DIOSTRAT_SPACE_RES
(
mp
,
(
uint
)(
e
-
s
));
quota_flag
=
XFS_QMOPT_RES_REGBLKS
;
quota_flag
=
XFS_QMOPT_RES_REGBLKS
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录