Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
d4f0f122
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
d4f0f122
编写于
2月 27, 2006
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://oss.sgi.com:8090/oss/git/xfs-rc-fixes
上级
272a5322
2353e8e9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
22 deletion
+20
-22
fs/xfs/linux-2.6/xfs_aops.c
fs/xfs/linux-2.6/xfs_aops.c
+1
-1
fs/xfs/quota/xfs_qm.c
fs/xfs/quota/xfs_qm.c
+5
-6
fs/xfs/xfs_rtalloc.c
fs/xfs/xfs_rtalloc.c
+14
-15
未找到文件。
fs/xfs/linux-2.6/xfs_aops.c
浏览文件 @
d4f0f122
...
...
@@ -540,7 +540,7 @@ xfs_probe_cluster(
/* First sum forwards in this page */
do
{
if
(
mapped
!=
buffer_mapped
(
bh
))
if
(
!
buffer_uptodate
(
bh
)
||
(
mapped
!=
buffer_mapped
(
bh
)
))
return
total
;
total
+=
bh
->
b_size
;
}
while
((
bh
=
bh
->
b_this_page
)
!=
head
);
...
...
fs/xfs/quota/xfs_qm.c
浏览文件 @
d4f0f122
...
...
@@ -68,6 +68,9 @@ kmem_zone_t *qm_dqzone;
kmem_zone_t
*
qm_dqtrxzone
;
STATIC
kmem_shaker_t
xfs_qm_shaker
;
STATIC
cred_t
xfs_zerocr
;
STATIC
xfs_inode_t
xfs_zeroino
;
STATIC
void
xfs_qm_list_init
(
xfs_dqlist_t
*
,
char
*
,
int
);
STATIC
void
xfs_qm_list_destroy
(
xfs_dqlist_t
*
);
...
...
@@ -1393,8 +1396,6 @@ xfs_qm_qino_alloc(
xfs_trans_t
*
tp
;
int
error
;
unsigned
long
s
;
cred_t
zerocr
;
xfs_inode_t
zeroino
;
int
committed
;
tp
=
xfs_trans_alloc
(
mp
,
XFS_TRANS_QM_QINOCREATE
);
...
...
@@ -1406,11 +1407,9 @@ xfs_qm_qino_alloc(
xfs_trans_cancel
(
tp
,
0
);
return
error
;
}
memset
(
&
zerocr
,
0
,
sizeof
(
zerocr
));
memset
(
&
zeroino
,
0
,
sizeof
(
zeroino
));
if
((
error
=
xfs_dir_ialloc
(
&
tp
,
&
zeroino
,
S_IFREG
,
1
,
0
,
&
zerocr
,
0
,
1
,
ip
,
&
committed
)))
{
if
((
error
=
xfs_dir_ialloc
(
&
tp
,
&
xfs_
zeroino
,
S_IFREG
,
1
,
0
,
&
xfs_
zerocr
,
0
,
1
,
ip
,
&
committed
)))
{
xfs_trans_cancel
(
tp
,
XFS_TRANS_RELEASE_LOG_RES
|
XFS_TRANS_ABORT
);
return
error
;
...
...
fs/xfs/xfs_rtalloc.c
浏览文件 @
d4f0f122
...
...
@@ -130,7 +130,8 @@ xfs_growfs_rt_alloc(
/*
* Lock the inode.
*/
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
ino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
ino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
goto
error_exit
;
XFS_BMAP_INIT
(
&
flist
,
&
firstblock
);
/*
...
...
@@ -170,8 +171,8 @@ xfs_growfs_rt_alloc(
/*
* Lock the bitmap inode.
*/
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
ino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
ino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
goto
error_exit
;
/*
* Get a buffer for the block.
...
...
@@ -2023,8 +2024,8 @@ xfs_growfs_rt(
/*
* Lock out other callers by grabbing the bitmap inode lock.
*/
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
0
,
mp
->
m_sb
.
sb_rbmino
,
XFS_ILOCK_EXCL
,
&
ip
)))
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rbmino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
goto
error_exit
;
ASSERT
(
ip
==
mp
->
m_rbmip
);
/*
...
...
@@ -2037,8 +2038,8 @@ xfs_growfs_rt(
/*
* Get the summary inode into the transaction.
*/
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rsumino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rsumino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
goto
error_exit
;
ASSERT
(
ip
==
mp
->
m_rsumip
);
/*
...
...
@@ -2158,10 +2159,9 @@ xfs_rtallocate_extent(
/*
* Lock out other callers by grabbing the bitmap inode lock.
*/
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rbmino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
);
if
(
error
)
{
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rbmino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
return
error
;
}
sumbp
=
NULL
;
/*
* Allocate by size, or near another block, or exactly at some block.
...
...
@@ -2221,10 +2221,9 @@ xfs_rtfree_extent(
/*
* Synchronize by locking the bitmap inode.
*/
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rbmino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
);
if
(
error
)
{
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rbmino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
)))
return
error
;
}
#if defined(__KERNEL__) && defined(DEBUG)
/*
* Check to see that this whole range is currently allocated.
...
...
@@ -2365,8 +2364,8 @@ xfs_rtpick_extent(
__uint64_t
seq
;
/* sequence number of file creation */
__uint64_t
*
seqp
;
/* pointer to seqno in inode */
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rbmino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
);
if
(
error
)
if
((
error
=
xfs_trans_iget
(
mp
,
tp
,
mp
->
m_sb
.
sb_rbmino
,
0
,
XFS_ILOCK_EXCL
,
&
ip
))
)
return
error
;
ASSERT
(
ip
==
mp
->
m_rbmip
);
seqp
=
(
__uint64_t
*
)
&
ip
->
i_d
.
di_atime
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录