diff options
Diffstat (limited to 'fs/ocfs2/buffer_head_io.h')
-rw-r--r-- | fs/ocfs2/buffer_head_io.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/fs/ocfs2/buffer_head_io.h b/fs/ocfs2/buffer_head_io.h index 71646b470ac8..fd0d774ac356 100644 --- a/fs/ocfs2/buffer_head_io.h +++ b/fs/ocfs2/buffer_head_io.h | |||
@@ -31,21 +31,19 @@ | |||
31 | void ocfs2_end_buffer_io_sync(struct buffer_head *bh, | 31 | void ocfs2_end_buffer_io_sync(struct buffer_head *bh, |
32 | int uptodate); | 32 | int uptodate); |
33 | 33 | ||
34 | static inline int ocfs2_read_block(struct ocfs2_super *osb, | 34 | static inline int ocfs2_read_block(struct inode *inode, |
35 | u64 off, | 35 | u64 off, |
36 | struct buffer_head **bh, | 36 | struct buffer_head **bh, |
37 | int flags, | 37 | int flags); |
38 | struct inode *inode); | ||
39 | 38 | ||
40 | int ocfs2_write_block(struct ocfs2_super *osb, | 39 | int ocfs2_write_block(struct ocfs2_super *osb, |
41 | struct buffer_head *bh, | 40 | struct buffer_head *bh, |
42 | struct inode *inode); | 41 | struct inode *inode); |
43 | int ocfs2_read_blocks(struct ocfs2_super *osb, | 42 | int ocfs2_read_blocks(struct inode *inode, |
44 | u64 block, | 43 | u64 block, |
45 | int nr, | 44 | int nr, |
46 | struct buffer_head *bhs[], | 45 | struct buffer_head *bhs[], |
47 | int flags, | 46 | int flags); |
48 | struct inode *inode); | ||
49 | int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block, | 47 | int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block, |
50 | unsigned int nr, struct buffer_head *bhs[]); | 48 | unsigned int nr, struct buffer_head *bhs[]); |
51 | 49 | ||
@@ -55,9 +53,8 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, | |||
55 | #define OCFS2_BH_CACHED 1 | 53 | #define OCFS2_BH_CACHED 1 |
56 | #define OCFS2_BH_READAHEAD 8 | 54 | #define OCFS2_BH_READAHEAD 8 |
57 | 55 | ||
58 | static inline int ocfs2_read_block(struct ocfs2_super * osb, u64 off, | 56 | static inline int ocfs2_read_block(struct inode *inode, u64 off, |
59 | struct buffer_head **bh, int flags, | 57 | struct buffer_head **bh, int flags) |
60 | struct inode *inode) | ||
61 | { | 58 | { |
62 | int status = 0; | 59 | int status = 0; |
63 | 60 | ||
@@ -67,8 +64,7 @@ static inline int ocfs2_read_block(struct ocfs2_super * osb, u64 off, | |||
67 | goto bail; | 64 | goto bail; |
68 | } | 65 | } |
69 | 66 | ||
70 | status = ocfs2_read_blocks(osb, off, 1, bh, | 67 | status = ocfs2_read_blocks(inode, off, 1, bh, flags); |
71 | flags, inode); | ||
72 | 68 | ||
73 | bail: | 69 | bail: |
74 | return status; | 70 | return status; |