Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
666a2c53
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
666a2c53
编写于
1月 18, 2006
作者:
S
Steven Whitehouse
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[GFS2] Remove unused code from various files
Signed-off-by:
N
Steven Whitehouse
<
swhiteho@redhat.com
>
上级
c73530a1
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
1 addition
and
232 deletion
+1
-232
fs/gfs2/bmap.c
fs/gfs2/bmap.c
+1
-80
fs/gfs2/bmap.h
fs/gfs2/bmap.h
+0
-2
fs/gfs2/dir.c
fs/gfs2/dir.c
+0
-51
fs/gfs2/dir.h
fs/gfs2/dir.h
+0
-2
fs/gfs2/eattr.c
fs/gfs2/eattr.c
+0
-57
fs/gfs2/eattr.h
fs/gfs2/eattr.h
+0
-2
fs/gfs2/util.c
fs/gfs2/util.c
+0
-30
fs/gfs2/util.h
fs/gfs2/util.h
+0
-8
未找到文件。
fs/gfs2/bmap.c
浏览文件 @
666a2c53
...
...
@@ -999,7 +999,7 @@ static int do_shrink(struct gfs2_inode *ip, uint64_t size,
}
/**
* gfs2_truncatei - make a file a give size
* gfs2_truncatei - make a file a give
n
size
* @ip: the inode
* @size: the size to make the file
* @truncator: function to truncate the last partial block
...
...
@@ -1125,82 +1125,3 @@ int gfs2_write_alloc_required(struct gfs2_inode *ip, uint64_t offset,
return
0
;
}
/**
* do_gfm - Copy out the dinode/indirect blocks of a file
* @ip: the file
* @dibh: the dinode buffer
* @bh: the indirect buffer we're looking at
* @top: the first pointer in the block
* @bottom: one more than the last pointer in the block
* @height: the height the block is at
* @data: a pointer to a struct gfs2_user_buffer structure
*
* If this is a journaled file, copy out the data too.
*
* Returns: errno
*/
static
int
do_gfm
(
struct
gfs2_inode
*
ip
,
struct
buffer_head
*
dibh
,
struct
buffer_head
*
bh
,
uint64_t
*
top
,
uint64_t
*
bottom
,
unsigned
int
height
,
void
*
data
)
{
struct
gfs2_user_buffer
*
ub
=
(
struct
gfs2_user_buffer
*
)
data
;
int
error
;
error
=
gfs2_add_bh_to_ub
(
ub
,
bh
);
if
(
error
)
return
error
;
if
(
!
S_ISDIR
(
ip
->
i_di
.
di_mode
)
||
height
+
1
!=
ip
->
i_di
.
di_height
)
return
0
;
for
(;
top
<
bottom
;
top
++
)
if
(
*
top
)
{
struct
buffer_head
*
data_bh
;
error
=
gfs2_meta_read
(
ip
->
i_gl
,
be64_to_cpu
(
*
top
),
DIO_START
|
DIO_WAIT
,
&
data_bh
);
if
(
error
)
return
error
;
error
=
gfs2_add_bh_to_ub
(
ub
,
data_bh
);
brelse
(
data_bh
);
if
(
error
)
return
error
;
}
return
0
;
}
/**
* gfs2_get_file_meta - return all the metadata for a file
* @ip: the file
* @ub: the structure representing the meta
*
* Returns: errno
*/
int
gfs2_get_file_meta
(
struct
gfs2_inode
*
ip
,
struct
gfs2_user_buffer
*
ub
)
{
int
error
;
if
(
gfs2_is_stuffed
(
ip
))
{
struct
buffer_head
*
dibh
;
error
=
gfs2_meta_inode_buffer
(
ip
,
&
dibh
);
if
(
!
error
)
{
error
=
gfs2_add_bh_to_ub
(
ub
,
dibh
);
brelse
(
dibh
);
}
}
else
{
struct
metapath
mp
;
find_metapath
(
ip
,
0
,
&
mp
);
error
=
recursive_scan
(
ip
,
NULL
,
&
mp
,
0
,
0
,
1
,
do_gfm
,
ub
);
}
return
error
;
}
fs/gfs2/bmap.h
浏览文件 @
666a2c53
...
...
@@ -34,6 +34,4 @@ void gfs2_write_calc_reserv(struct gfs2_inode *ip, unsigned int len,
int
gfs2_write_alloc_required
(
struct
gfs2_inode
*
ip
,
uint64_t
offset
,
unsigned
int
len
,
int
*
alloc_required
);
int
gfs2_get_file_meta
(
struct
gfs2_inode
*
ip
,
struct
gfs2_user_buffer
*
ub
);
#endif
/* __BMAP_DOT_H__ */
fs/gfs2/dir.c
浏览文件 @
666a2c53
...
...
@@ -2104,54 +2104,3 @@ int gfs2_diradd_alloc_required(struct gfs2_inode *dip, struct qstr *filename,
return
error
;
}
/**
* do_gdm - copy out one leaf (or list of leaves)
* @dip: the directory
* @index: the hash table offset in the directory
* @len: the number of pointers to this leaf
* @leaf_no: the leaf number
* @data: a pointer to a struct gfs2_user_buffer structure
*
* Returns: errno
*/
static
int
do_gdm
(
struct
gfs2_inode
*
dip
,
uint32_t
index
,
uint32_t
len
,
uint64_t
leaf_no
,
void
*
data
)
{
struct
gfs2_user_buffer
*
ub
=
(
struct
gfs2_user_buffer
*
)
data
;
struct
gfs2_leaf
leaf
;
struct
buffer_head
*
bh
;
uint64_t
blk
;
int
error
=
0
;
for
(
blk
=
leaf_no
;
blk
;
blk
=
leaf
.
lf_next
)
{
error
=
get_leaf
(
dip
,
blk
,
&
bh
);
if
(
error
)
break
;
gfs2_leaf_in
(
&
leaf
,
bh
->
b_data
);
error
=
gfs2_add_bh_to_ub
(
ub
,
bh
);
brelse
(
bh
);
if
(
error
)
break
;
}
return
error
;
}
/**
* gfs2_get_dir_meta - return all the leaf blocks of a directory
* @dip: the directory
* @ub: the structure representing the meta
*
* Returns: errno
*/
int
gfs2_get_dir_meta
(
struct
gfs2_inode
*
dip
,
struct
gfs2_user_buffer
*
ub
)
{
return
foreach_leaf
(
dip
,
do_gdm
,
ub
);
}
fs/gfs2/dir.h
浏览文件 @
666a2c53
...
...
@@ -46,6 +46,4 @@ int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip);
int
gfs2_diradd_alloc_required
(
struct
gfs2_inode
*
dip
,
struct
qstr
*
filename
,
int
*
alloc_required
);
int
gfs2_get_dir_meta
(
struct
gfs2_inode
*
ip
,
struct
gfs2_user_buffer
*
ub
);
#endif
/* __DIR_DOT_H__ */
fs/gfs2/eattr.c
浏览文件 @
666a2c53
...
...
@@ -1561,60 +1561,3 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip)
return
error
;
}
/**
* gfs2_get_eattr_meta - return all the eattr blocks of a file
* @dip: the directory
* @ub: the structure representing the user buffer to copy to
*
* Returns: errno
*/
int
gfs2_get_eattr_meta
(
struct
gfs2_inode
*
ip
,
struct
gfs2_user_buffer
*
ub
)
{
struct
buffer_head
*
bh
;
int
error
;
error
=
gfs2_meta_read
(
ip
->
i_gl
,
ip
->
i_di
.
di_eattr
,
DIO_START
|
DIO_WAIT
,
&
bh
);
if
(
error
)
return
error
;
gfs2_add_bh_to_ub
(
ub
,
bh
);
if
(
ip
->
i_di
.
di_flags
&
GFS2_DIF_EA_INDIRECT
)
{
struct
buffer_head
*
eabh
;
uint64_t
*
eablk
,
*
end
;
if
(
gfs2_metatype_check
(
ip
->
i_sbd
,
bh
,
GFS2_METATYPE_IN
))
{
error
=
-
EIO
;
goto
out
;
}
eablk
=
(
uint64_t
*
)(
bh
->
b_data
+
sizeof
(
struct
gfs2_meta_header
));
end
=
eablk
+
ip
->
i_sbd
->
sd_inptrs
;
for
(;
eablk
<
end
;
eablk
++
)
{
uint64_t
bn
;
if
(
!*
eablk
)
break
;
bn
=
be64_to_cpu
(
*
eablk
);
error
=
gfs2_meta_read
(
ip
->
i_gl
,
bn
,
DIO_START
|
DIO_WAIT
,
&
eabh
);
if
(
error
)
break
;
gfs2_add_bh_to_ub
(
ub
,
eabh
);
brelse
(
eabh
);
if
(
error
)
break
;
}
}
out:
brelse
(
bh
);
return
error
;
}
fs/gfs2/eattr.h
浏览文件 @
666a2c53
...
...
@@ -74,8 +74,6 @@ int gfs2_ea_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er);
int
gfs2_ea_dealloc
(
struct
gfs2_inode
*
ip
);
int
gfs2_get_eattr_meta
(
struct
gfs2_inode
*
ip
,
struct
gfs2_user_buffer
*
ub
);
/* Exported to acl.c */
int
gfs2_ea_find
(
struct
gfs2_inode
*
ip
,
...
...
fs/gfs2/util.c
浏览文件 @
666a2c53
...
...
@@ -221,36 +221,6 @@ int gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh,
return
rv
;
}
/**
* gfs2_add_bh_to_ub - copy a buffer up to user space
* @ub: the structure representing where to copy
* @bh: the buffer
*
* Returns: errno
*/
int
gfs2_add_bh_to_ub
(
struct
gfs2_user_buffer
*
ub
,
struct
buffer_head
*
bh
)
{
uint64_t
blkno
=
bh
->
b_blocknr
;
if
(
ub
->
ub_count
+
sizeof
(
uint64_t
)
+
bh
->
b_size
>
ub
->
ub_size
)
return
-
ENOMEM
;
if
(
copy_to_user
(
ub
->
ub_data
+
ub
->
ub_count
,
&
blkno
,
sizeof
(
uint64_t
)))
return
-
EFAULT
;
ub
->
ub_count
+=
sizeof
(
uint64_t
);
if
(
copy_to_user
(
ub
->
ub_data
+
ub
->
ub_count
,
bh
->
b_data
,
bh
->
b_size
))
return
-
EFAULT
;
ub
->
ub_count
+=
bh
->
b_size
;
return
0
;
}
void
gfs2_icbit_munge
(
struct
gfs2_sbd
*
sdp
,
unsigned
char
**
bitmap
,
unsigned
int
bit
,
int
new_value
)
{
...
...
fs/gfs2/util.h
浏览文件 @
666a2c53
...
...
@@ -152,14 +152,6 @@ extern kmem_cache_t *gfs2_glock_cachep;
extern
kmem_cache_t
*
gfs2_inode_cachep
;
extern
kmem_cache_t
*
gfs2_bufdata_cachep
;
struct
gfs2_user_buffer
{
char
__user
*
ub_data
;
unsigned
int
ub_size
;
unsigned
int
ub_count
;
};
int
gfs2_add_bh_to_ub
(
struct
gfs2_user_buffer
*
ub
,
struct
buffer_head
*
bh
);
static
inline
unsigned
int
gfs2_tune_get_i
(
struct
gfs2_tune
*
gt
,
unsigned
int
*
p
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录