git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ocfs2: Require an inode for ocfs2_read_block(s)().
[pandora-kernel.git]
/
fs
/
ocfs2
/
extent_map.c
diff --git
a/fs/ocfs2/extent_map.c
b/fs/ocfs2/extent_map.c
index
a7b1cfa
..
5b48221
100644
(file)
--- a/
fs/ocfs2/extent_map.c
+++ b/
fs/ocfs2/extent_map.c
@@
-293,8
+293,8
@@
static int ocfs2_last_eb_is_empty(struct inode *inode,
struct ocfs2_extent_block *eb;
struct ocfs2_extent_list *el;
struct ocfs2_extent_block *eb;
struct ocfs2_extent_list *el;
- ret = ocfs2_read_block(
OCFS2_SB(inode->i_sb)
, last_eb_blk,
- &eb_bh, OCFS2_BH_CACHED
, inode
);
+ ret = ocfs2_read_block(
inode
, last_eb_blk,
+ &eb_bh, OCFS2_BH_CACHED);
if (ret) {
mlog_errno(ret);
goto out;
if (ret) {
mlog_errno(ret);
goto out;
@@
-382,9
+382,9
@@
static int ocfs2_figure_hole_clusters(struct inode *inode,
if (le64_to_cpu(eb->h_next_leaf_blk) == 0ULL)
goto no_more_extents;
if (le64_to_cpu(eb->h_next_leaf_blk) == 0ULL)
goto no_more_extents;
- ret = ocfs2_read_block(
OCFS2_SB(inode->i_sb)
,
+ ret = ocfs2_read_block(
inode
,
le64_to_cpu(eb->h_next_leaf_blk),
le64_to_cpu(eb->h_next_leaf_blk),
- &next_eb_bh, OCFS2_BH_CACHED
, inode
);
+ &next_eb_bh, OCFS2_BH_CACHED);
if (ret) {
mlog_errno(ret);
goto out;
if (ret) {
mlog_errno(ret);
goto out;
@@
-631,8
+631,8
@@
int ocfs2_get_clusters(struct inode *inode, u32 v_cluster,
if (ret == 0)
goto out;
if (ret == 0)
goto out;
- ret = ocfs2_read_block(
OCFS2_SB(inode->i_sb)
, OCFS2_I(inode)->ip_blkno,
- &di_bh, OCFS2_BH_CACHED
, inode
);
+ ret = ocfs2_read_block(
inode
, OCFS2_I(inode)->ip_blkno,
+ &di_bh, OCFS2_BH_CACHED);
if (ret) {
mlog_errno(ret);
goto out;
if (ret) {
mlog_errno(ret);
goto out;