diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-01-30 13:34:10 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-01-30 13:34:10 -0500 |
commit | f42faf4fa4eaf7e108dd60f3f2ca5c6e9b45352c (patch) | |
tree | 23bf95db3b941a4b14f8b90f98a8aaa663ed6c81 /fs/gfs2/unlinked.c | |
parent | fd2ee6bb1ef02dfe1f1e1f5b44322e0854596e9a (diff) |
[GFS2] Add gfs2_internal_read()
Add the new external read function. Its temporarily in jdata.c
even though the protoype is in ops_file.h - this will change
shortly. The current implementation will change to a page cache
one when that happens.
In order to effect the above changes, the various internal inodes
now have Linux inodes attached to them. We keep the references to
the Linux inodes, rather than the gfs2_inodes in the super block.
In order to get everything to work correctly I've had to reorder
the init sequence on mount (which I should probably have done
earlier when .gfs2_admin was made visible).
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/unlinked.c')
-rw-r--r-- | fs/gfs2/unlinked.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/unlinked.c b/fs/gfs2/unlinked.c index b8d836e3a5c0..405b91b0295d 100644 --- a/fs/gfs2/unlinked.c +++ b/fs/gfs2/unlinked.c | |||
@@ -25,7 +25,7 @@ | |||
25 | static int munge_ondisk(struct gfs2_sbd *sdp, unsigned int slot, | 25 | static int munge_ondisk(struct gfs2_sbd *sdp, unsigned int slot, |
26 | struct gfs2_unlinked_tag *ut) | 26 | struct gfs2_unlinked_tag *ut) |
27 | { | 27 | { |
28 | struct gfs2_inode *ip = sdp->sd_ut_inode; | 28 | struct gfs2_inode *ip = get_v2ip(sdp->sd_ut_inode); |
29 | unsigned int block, offset; | 29 | unsigned int block, offset; |
30 | uint64_t dblock; | 30 | uint64_t dblock; |
31 | int new = 0; | 31 | int new = 0; |
@@ -312,7 +312,7 @@ int gfs2_unlinked_dealloc(struct gfs2_sbd *sdp) | |||
312 | 312 | ||
313 | int gfs2_unlinked_init(struct gfs2_sbd *sdp) | 313 | int gfs2_unlinked_init(struct gfs2_sbd *sdp) |
314 | { | 314 | { |
315 | struct gfs2_inode *ip = sdp->sd_ut_inode; | 315 | struct gfs2_inode *ip = get_v2ip(sdp->sd_ut_inode); |
316 | unsigned int blocks = ip->i_di.di_size >> sdp->sd_sb.sb_bsize_shift; | 316 | unsigned int blocks = ip->i_di.di_size >> sdp->sd_sb.sb_bsize_shift; |
317 | unsigned int x, slot = 0; | 317 | unsigned int x, slot = 0; |
318 | unsigned int found = 0; | 318 | unsigned int found = 0; |