]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
gfs2: remove unneeded pg_oflow variable
authorBob Peterson <rpeterso@redhat.com>
Wed, 31 May 2023 16:41:16 +0000 (11:41 -0500)
committerAndreas Gruenbacher <agruenba@redhat.com>
Tue, 5 Sep 2023 13:58:17 +0000 (15:58 +0200)
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: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
fs/gfs2/quota.c

index 59c6fa01455da600588016c5b6d66506a7747c4f..678b21cad30313306f7b27ab83f2e8afdcfd7a24 100644 (file)
@@ -802,7 +802,7 @@ static int gfs2_write_disk_quota(struct gfs2_sbd *sdp, struct gfs2_quota *qp,
 {
        unsigned long pg_beg;
        unsigned pg_off, nbytes, overflow = 0;
-       int pg_oflow = 0, error;
+       int error;
        void *ptr;
 
        nbytes = sizeof(struct gfs2_quota);
@@ -811,16 +811,14 @@ static int gfs2_write_disk_quota(struct gfs2_sbd *sdp, struct gfs2_quota *qp,
        pg_off = offset_in_page(loc);
 
        /* If the quota straddles a page boundary, split the write in two */
-       if ((pg_off + nbytes) > PAGE_SIZE) {
-               pg_oflow = 1;
+       if ((pg_off + nbytes) > PAGE_SIZE)
                overflow = (pg_off + nbytes) - PAGE_SIZE;
-       }
 
        ptr = qp;
        error = gfs2_write_buf_to_page(sdp, pg_beg, pg_off, ptr,
                                       nbytes - overflow);
        /* 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,
                                               ptr + nbytes - overflow,
                                               overflow);