Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
2ccdc413
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看板
提交
2ccdc413
编写于
11月 22, 2013
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
kill reiserfs_bdevname()
it's never called with NULL argument... Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
b42d570c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
14 deletion
+6
-14
fs/reiserfs/procfs.c
fs/reiserfs/procfs.c
+2
-2
fs/reiserfs/reiserfs.h
fs/reiserfs/reiserfs.h
+0
-8
fs/reiserfs/super.c
fs/reiserfs/super.c
+4
-4
未找到文件。
fs/reiserfs/procfs.c
浏览文件 @
2ccdc413
...
...
@@ -419,7 +419,7 @@ int reiserfs_proc_info_init(struct super_block *sb)
char
*
s
;
/* Some block devices use /'s */
strlcpy
(
b
,
reiserfs_bdevname
(
sb
)
,
BDEVNAME_SIZE
);
strlcpy
(
b
,
sb
->
s_id
,
BDEVNAME_SIZE
);
s
=
strchr
(
b
,
'/'
);
if
(
s
)
*
s
=
'!'
;
...
...
@@ -449,7 +449,7 @@ int reiserfs_proc_info_done(struct super_block *sb)
char
*
s
;
/* Some block devices use /'s */
strlcpy
(
b
,
reiserfs_bdevname
(
sb
)
,
BDEVNAME_SIZE
);
strlcpy
(
b
,
sb
->
s_id
,
BDEVNAME_SIZE
);
s
=
strchr
(
b
,
'/'
);
if
(
s
)
*
s
=
'!'
;
...
...
fs/reiserfs/reiserfs.h
浏览文件 @
2ccdc413
...
...
@@ -608,14 +608,6 @@ int reiserfs_resize(struct super_block *, unsigned long);
#define SB_DISK_JOURNAL_HEAD(s) (SB_JOURNAL(s)->j_header_bh->)
/* A safe version of the "bdevname", which returns the "s_id" field of
* a superblock or else "Null superblock" if the super block is NULL.
*/
static
inline
char
*
reiserfs_bdevname
(
struct
super_block
*
s
)
{
return
(
s
==
NULL
)
?
"Null superblock"
:
s
->
s_id
;
}
#define reiserfs_is_journal_aborted(journal) (unlikely (__reiserfs_is_journal_aborted (journal)))
static
inline
int
__reiserfs_is_journal_aborted
(
struct
reiserfs_journal
*
journal
)
...
...
fs/reiserfs/super.c
浏览文件 @
2ccdc413
...
...
@@ -1479,7 +1479,7 @@ static int read_super_block(struct super_block *s, int offset)
if
(
!
bh
)
{
reiserfs_warning
(
s
,
"sh-2006"
,
"bread failed (dev %s, block %lu, size %lu)"
,
reiserfs_bdevname
(
s
)
,
offset
/
s
->
s_blocksize
,
s
->
s_id
,
offset
/
s
->
s_blocksize
,
s
->
s_blocksize
);
return
1
;
}
...
...
@@ -1500,7 +1500,7 @@ static int read_super_block(struct super_block *s, int offset)
if
(
!
bh
)
{
reiserfs_warning
(
s
,
"sh-2007"
,
"bread failed (dev %s, block %lu, size %lu)"
,
reiserfs_bdevname
(
s
)
,
offset
/
s
->
s_blocksize
,
s
->
s_id
,
offset
/
s
->
s_blocksize
,
s
->
s_blocksize
);
return
1
;
}
...
...
@@ -1509,7 +1509,7 @@ static int read_super_block(struct super_block *s, int offset)
if
(
sb_blocksize
(
rs
)
!=
s
->
s_blocksize
)
{
reiserfs_warning
(
s
,
"sh-2011"
,
"can't find a reiserfs "
"filesystem on (dev %s, block %Lu, size %lu)"
,
reiserfs_bdevname
(
s
)
,
s
->
s_id
,
(
unsigned
long
long
)
bh
->
b_blocknr
,
s
->
s_blocksize
);
brelse
(
bh
);
...
...
@@ -1825,7 +1825,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
/* try new format (64-th 1k block), which can contain reiserfs super block */
else
if
(
read_super_block
(
s
,
REISERFS_DISK_OFFSET_IN_BYTES
))
{
SWARN
(
silent
,
s
,
"sh-2021"
,
"can not find reiserfs on %s"
,
reiserfs_bdevname
(
s
)
);
s
->
s_id
);
goto
error_unlocked
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录