Commit e34c16c9 authored by Bob Peterson's avatar Bob Peterson Committed by Andreas Gruenbacher

gfs2: remove unneeded pg_oflow variable

Function gfs2_write_disk_quota checks if its write overflows onto
another page, and if so, does a second write. Before this patch it kept
two variables for this, but only one is needed. This patch simplifies
it by eliminating pg_oflow.
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent f0418e4b
...@@ -802,7 +802,7 @@ static int gfs2_write_disk_quota(struct gfs2_sbd *sdp, struct gfs2_quota *qp, ...@@ -802,7 +802,7 @@ static int gfs2_write_disk_quota(struct gfs2_sbd *sdp, struct gfs2_quota *qp,
{ {
unsigned long pg_beg; unsigned long pg_beg;
unsigned pg_off, nbytes, overflow = 0; unsigned pg_off, nbytes, overflow = 0;
int pg_oflow = 0, error; int error;
void *ptr; void *ptr;
nbytes = sizeof(struct gfs2_quota); nbytes = sizeof(struct gfs2_quota);
...@@ -811,16 +811,14 @@ static int gfs2_write_disk_quota(struct gfs2_sbd *sdp, struct gfs2_quota *qp, ...@@ -811,16 +811,14 @@ static int gfs2_write_disk_quota(struct gfs2_sbd *sdp, struct gfs2_quota *qp,
pg_off = offset_in_page(loc); pg_off = offset_in_page(loc);
/* If the quota straddles a page boundary, split the write in two */ /* If the quota straddles a page boundary, split the write in two */
if ((pg_off + nbytes) > PAGE_SIZE) { if ((pg_off + nbytes) > PAGE_SIZE)
pg_oflow = 1;
overflow = (pg_off + nbytes) - PAGE_SIZE; overflow = (pg_off + nbytes) - PAGE_SIZE;
}
ptr = qp; ptr = qp;
error = gfs2_write_buf_to_page(sdp, pg_beg, pg_off, ptr, error = gfs2_write_buf_to_page(sdp, pg_beg, pg_off, ptr,
nbytes - overflow); nbytes - overflow);
/* If there's an overflow, write the remaining bytes to the next page */ /* If there's an overflow, write the remaining bytes to the next page */
if (!error && pg_oflow) if (!error && overflow)
error = gfs2_write_buf_to_page(sdp, pg_beg + 1, 0, error = gfs2_write_buf_to_page(sdp, pg_beg + 1, 0,
ptr + nbytes - overflow, ptr + nbytes - overflow,
overflow); overflow);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment