diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2007-10-15 14:42:35 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2008-01-25 08:07:11 +0000 |
| commit | 51ff87bdd9f21a5d3672517b75d25ab5842d94a8 (patch) | |
| tree | 7a8de5720b2a63e8d7d03a940a2b06196b2a3776 /fs/gfs2/quota.c | |
| parent | cc7e79b168a552152299bd8a8254dc099aacc993 (diff) | |
| download | linux-3.10-51ff87bdd9f21a5d3672517b75d25ab5842d94a8.tar.gz linux-3.10-51ff87bdd9f21a5d3672517b75d25ab5842d94a8.tar.bz2 linux-3.10-51ff87bdd9f21a5d3672517b75d25ab5842d94a8.zip | |
[GFS2] Clean up internal read function
As requested by Christoph, this patch cleans up GFS2's internal
read function so that it no longer uses the do_generic_mapping_read
function. This function is obsolete and GFS2 is the last user of it.
As a side effect the internal read code gets smaller and easier
to read and gfs2_readpage is split into two. One function has the locking
and the other function has the rest of the logic.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Diffstat (limited to 'fs/gfs2/quota.c')
| -rw-r--r-- | fs/gfs2/quota.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index addb51e0f13..4996f0ef300 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -59,7 +59,6 @@ #include "super.h" #include "trans.h" #include "inode.h" -#include "ops_file.h" #include "ops_address.h" #include "util.h" @@ -793,11 +792,9 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh, struct gfs2_holder i_gh; struct gfs2_quota_host q; char buf[sizeof(struct gfs2_quota)]; - struct file_ra_state ra_state; int error; struct gfs2_quota_lvb *qlvb; - file_ra_state_init(&ra_state, sdp->sd_quota_inode->i_mapping); restart: error = gfs2_glock_nq_init(qd->qd_gl, LM_ST_SHARED, 0, q_gh); if (error) @@ -820,8 +817,8 @@ restart: memset(buf, 0, sizeof(struct gfs2_quota)); pos = qd2offset(qd); - error = gfs2_internal_read(ip, &ra_state, buf, - &pos, sizeof(struct gfs2_quota)); + error = gfs2_internal_read(ip, NULL, buf, &pos, + sizeof(struct gfs2_quota)); if (error < 0) goto fail_gunlock; |