]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
libxfs: remove unused flags parameter to libxfs_buf_mark_dirty
authorDarrick J. Wong <darrick.wong@oracle.com>
Sun, 1 Mar 2020 17:34:11 +0000 (12:34 -0500)
committerEric Sandeen <sandeen@sandeen.net>
Sun, 1 Mar 2020 17:34:11 +0000 (12:34 -0500)
Nobody uses the flags parameter, so get rid of it.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
15 files changed:
libxfs/libxfs_io.h
libxfs/rdwr.c
libxfs/trans.c
mkfs/proto.c
mkfs/xfs_mkfs.c
repair/attr_repair.c
repair/da_util.c
repair/dino_chunks.c
repair/dinode.c
repair/dir2.c
repair/phase3.c
repair/phase5.c
repair/rmap.c
repair/scan.c
repair/xfs_repair.c

index 51b1dc15818f6af807fb3d98db21eed21ac4ec09..78ce989c5611f47f94b761a0233d3ee2e98b0390 100644 (file)
@@ -136,9 +136,9 @@ extern struct cache_operations      libxfs_bcache_operations;
 #define libxfs_readbuf_map(dev, map, nmaps, flags, ops) \
        libxfs_trace_readbuf_map(__FUNCTION__, __FILE__, __LINE__, \
                            (dev), (map), (nmaps), (flags), (ops))
-#define libxfs_buf_mark_dirty(buf, flags) \
+#define libxfs_buf_mark_dirty(buf) \
        libxfs_trace_dirtybuf(__FUNCTION__, __FILE__, __LINE__, \
-                             (buf), (flags))
+                             (buf))
 #define libxfs_buf_get(dev, daddr, len) \
        libxfs_trace_getbuf(__FUNCTION__, __FILE__, __LINE__, \
                            (dev), (daddr), (len))
@@ -158,7 +158,7 @@ extern xfs_buf_t *libxfs_trace_readbuf_map(const char *, const char *, int,
                        struct xfs_buftarg *, struct xfs_buf_map *, int, int,
                        const struct xfs_buf_ops *);
 void libxfs_trace_dirtybuf(const char *func, const char *file, int line,
-                       struct xfs_buf *bp, int flags);
+                       struct xfs_buf *bp);
 struct xfs_buf *libxfs_trace_getbuf(const char *func, const char *file,
                        int line, struct xfs_buftarg *btp, xfs_daddr_t daddr,
                        size_t len);
@@ -173,7 +173,7 @@ extern void libxfs_trace_putbuf (const char *, const char *, int,
 
 extern xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
                        int, int, const struct xfs_buf_ops *);
-void libxfs_buf_mark_dirty(struct xfs_buf *bp, int flags);
+void libxfs_buf_mark_dirty(struct xfs_buf *bp);
 extern xfs_buf_t *libxfs_getbuf_map(struct xfs_buftarg *,
                        struct xfs_buf_map *, int, int);
 extern xfs_buf_t *libxfs_getbuf_flags(struct xfs_buftarg *, xfs_daddr_t,
index 192e3586bcfb140237fb6891c1f12f17cb5e847c..db6f23882c95826a447ab71e9beb9e1a9f490699 100644 (file)
@@ -201,11 +201,10 @@ libxfs_trace_dirtybuf(
        const char              *func,
        const char              *file,
        int                     line,
-       struct xfs_buf          *bp,
-       int                     flags)
+       struct xfs_buf          *bp)
 {
        __add_trace(bp, func, file, line);
-       libxfs_buf_mark_dirty(bp, flags);
+       libxfs_buf_mark_dirty(bp);
 }
 
 struct xfs_buf *
@@ -1006,8 +1005,7 @@ libxfs_writebuf_int(xfs_buf_t *bp, int flags)
  */
 void
 libxfs_buf_mark_dirty(
-       struct xfs_buf  *bp,
-       int             flags)
+       struct xfs_buf  *bp)
 {
 #ifdef IO_DEBUG
        printf("%lx: %s: dirty blkno=%llu(%llu)\n",
@@ -1021,7 +1019,7 @@ libxfs_buf_mark_dirty(
         */
        bp->b_error = 0;
        bp->b_flags &= ~LIBXFS_B_STALE;
-       bp->b_flags |= (LIBXFS_B_DIRTY | flags);
+       bp->b_flags |= LIBXFS_B_DIRTY;
 }
 
 void
@@ -1423,7 +1421,7 @@ libxfs_log_clear(
        libxfs_log_header(ptr, fs_uuid, version, sunit, fmt, lsn, tail_lsn,
                          next, bp);
        if (bp) {
-               libxfs_buf_mark_dirty(bp, 0);
+               libxfs_buf_mark_dirty(bp);
                libxfs_buf_relse(bp);
        }
 
@@ -1475,7 +1473,7 @@ libxfs_log_clear(
                libxfs_log_header(ptr, fs_uuid, version, BBTOB(len), fmt, lsn,
                                  tail_lsn, next, bp);
                if (bp) {
-                       libxfs_buf_mark_dirty(bp, 0);
+                       libxfs_buf_mark_dirty(bp);
                        libxfs_buf_relse(bp);
                }
 
index 91001a93639a180140b77924e02bb7f1a99ab43c..ca1166ed7fd75d26f5f9afdf6114d5e6174611e5 100644 (file)
@@ -843,7 +843,7 @@ inode_item_done(
                goto free;
        }
 
-       libxfs_buf_mark_dirty(bp, 0);
+       libxfs_buf_mark_dirty(bp);
        libxfs_buf_relse(bp);
 free:
        xfs_inode_item_put(iip);
index 7de76ca45d5657defdf6a9e6a53c83e9c2cd5108..26a613fe33345834ab01fba685e9e60265233ce4 100644 (file)
@@ -262,7 +262,7 @@ newfile(
                if (logit)
                        libxfs_trans_log_buf(tp, bp, 0, bp->b_bcount - 1);
                else {
-                       libxfs_buf_mark_dirty(bp, 0);
+                       libxfs_buf_mark_dirty(bp);
                        libxfs_buf_relse(bp);
                }
        }
index 1c7e29613a9d63c8b64760bc9c8ef3f06e5f72d1..edf752f460c84b501fa77abdc6a726089b46264c 100644 (file)
@@ -3417,7 +3417,7 @@ prepare_devices(
        buf = alloc_write_buf(mp->m_ddev_targp, (xi->dsize - whack_blks),
                        whack_blks);
        memset(buf->b_addr, 0, WHACK_SIZE);
-       libxfs_buf_mark_dirty(buf, 0);
+       libxfs_buf_mark_dirty(buf);
        libxfs_buf_relse(buf);
 
        /*
@@ -3428,7 +3428,7 @@ prepare_devices(
         */
        buf = alloc_write_buf(mp->m_ddev_targp, 0, whack_blks);
        memset(buf->b_addr, 0, WHACK_SIZE);
-       libxfs_buf_mark_dirty(buf, 0);
+       libxfs_buf_mark_dirty(buf);
        libxfs_buf_relse(buf);
 
        /* OK, now write the superblock... */
@@ -3437,7 +3437,7 @@ prepare_devices(
        buf->b_ops = &xfs_sb_buf_ops;
        memset(buf->b_addr, 0, cfg->sectorsize);
        libxfs_sb_to_disk(buf->b_addr, sbp);
-       libxfs_buf_mark_dirty(buf, 0);
+       libxfs_buf_mark_dirty(buf);
        libxfs_buf_relse(buf);
 
        /* ...and zero the log.... */
@@ -3457,7 +3457,7 @@ prepare_devices(
                                XFS_FSB_TO_BB(mp, cfg->rtblocks - 1LL),
                                BTOBB(cfg->blocksize));
                memset(buf->b_addr, 0, cfg->blocksize);
-               libxfs_buf_mark_dirty(buf, 0);
+               libxfs_buf_mark_dirty(buf);
                libxfs_buf_relse(buf);
        }
 
@@ -3554,7 +3554,7 @@ rewrite_secondary_superblocks(
                exit(1);
        }
        XFS_BUF_TO_SBP(buf)->sb_rootino = cpu_to_be64(mp->m_sb.sb_rootino);
-       libxfs_buf_mark_dirty(buf, 0);
+       libxfs_buf_mark_dirty(buf);
        libxfs_buf_relse(buf);
 
        /* and one in the middle for luck if there's enough AGs for that */
@@ -3571,7 +3571,7 @@ rewrite_secondary_superblocks(
                exit(1);
        }
        XFS_BUF_TO_SBP(buf)->sb_rootino = cpu_to_be64(mp->m_sb.sb_rootino);
-       libxfs_buf_mark_dirty(buf, 0);
+       libxfs_buf_mark_dirty(buf);
        libxfs_buf_relse(buf);
 }
 
@@ -3919,7 +3919,7 @@ main(
        if (!buf || buf->b_error)
                exit(1);
        (XFS_BUF_TO_SBP(buf))->sb_inprogress = 0;
-       libxfs_buf_mark_dirty(buf, 0);
+       libxfs_buf_mark_dirty(buf);
        libxfs_buf_relse(buf);
 
        /* Exit w/ failure if anything failed to get written to our new fs. */
index e9423aa14818962ecd02835714c882462e7545a6..2acaef40819cce6a7194f852a0f05ac969eea6bb 100644 (file)
@@ -836,7 +836,7 @@ process_leaf_attr_level(xfs_mount_t *mp,
                        repair++;
 
                if (repair && !no_modify) {
-                       libxfs_buf_mark_dirty(bp, 0);
+                       libxfs_buf_mark_dirty(bp);
                        libxfs_buf_relse(bp);
                }
                else
@@ -1001,7 +1001,7 @@ _("would clear forw/back pointers in block 0 for attributes in inode %" PRIu64 "
        *repair = *repair || repairlinks;
 
        if (*repair && !no_modify)
-               libxfs_buf_mark_dirty(bp, 0);
+               libxfs_buf_mark_dirty(bp);
        libxfs_buf_relse(bp);
 
        return 0;
@@ -1044,7 +1044,7 @@ _("would clear forw/back pointers in block 0 for attributes in inode %" PRIu64 "
        /* must do this now, to release block 0 before the traversal */
        if ((*repair || repairlinks) && !no_modify) {
                *repair = 1;
-               libxfs_buf_mark_dirty(bp, 0);
+               libxfs_buf_mark_dirty(bp);
        }
        libxfs_buf_relse(bp);
        error = process_node_attr(mp, ino, dip, blkmap); /* + repair */
index 6a0e28a3f34d8489c0336518d021dbb0443c0972..dc1e5bfeeb1d0b408a0f20e6a8b26860ec524bbc 100644 (file)
@@ -404,7 +404,7 @@ _("would correct bad hashval in non-leaf %s block\n"
                (cursor->level[this_level].dirty && !no_modify));
 
        if (cursor->level[this_level].dirty && !no_modify) {
-               libxfs_buf_mark_dirty(cursor->level[this_level].bp, 0);
+               libxfs_buf_mark_dirty(cursor->level[this_level].bp);
                libxfs_buf_relse(cursor->level[this_level].bp);
        }
        else
@@ -622,7 +622,7 @@ _("bad level %d in %s block %u for inode %" PRIu64 "\n"),
                        cursor->level[this_level].dirty = 1;
 
                if (cursor->level[this_level].dirty && !no_modify) {
-                       libxfs_buf_mark_dirty(cursor->level[this_level].bp, 0);
+                       libxfs_buf_mark_dirty(cursor->level[this_level].bp);
                        libxfs_buf_relse(cursor->level[this_level].bp);
                }
                else
index 5b6f7fcac62b65f92275dd9d3ece108906a45964..b2ed1112bb17b749757a722c155ee066d4029bd2 100644 (file)
@@ -940,8 +940,7 @@ process_next:
                                        XFS_BUF_ADDR(bplist[bp_index]), agno);
 
                                if (dirty && !no_modify) {
-                                       libxfs_buf_mark_dirty(bplist[bp_index],
-                                                       0);
+                                       libxfs_buf_mark_dirty(bplist[bp_index]);
                                        libxfs_buf_relse(bplist[bp_index]);
                                }
                                else
index 502114f8b28365747310cb611dfae594fd3daff5..cd25323c1cce857790de2f5ad1c9c734620fd1e1 100644 (file)
@@ -1232,7 +1232,7 @@ bad:
                }
 
                if (writebuf && !no_modify) {
-                       libxfs_buf_mark_dirty(bp, 0);
+                       libxfs_buf_mark_dirty(bp);
                        libxfs_buf_relse(bp);
                }
                else
@@ -1331,7 +1331,7 @@ _("bad symlink header ino %" PRIu64 ", file block %d, disk block %" PRIu64 "\n")
                i++;
 
                if (badcrc && !no_modify) {
-                       libxfs_buf_mark_dirty(bp, 0);
+                       libxfs_buf_mark_dirty(bp);
                        libxfs_buf_relse(bp);
                }
                else
index 1384011b4cb032961b527fa9c2f0311b47ba3eb1..cbbce60188d6baf61a74a00b01a30be32866054d 100644 (file)
@@ -1010,7 +1010,7 @@ _("bad directory block magic # %#x in block %u for directory inode %" PRIu64 "\n
                dirty = 1;
        if (dirty && !no_modify) {
                *repair = 1;
-               libxfs_buf_mark_dirty(bp, 0);
+               libxfs_buf_mark_dirty(bp);
                libxfs_buf_relse(bp);
        } else
                libxfs_buf_relse(bp);
@@ -1181,7 +1181,7 @@ _("bad sibling back pointer for block %u in directory inode %" PRIu64 "\n"),
                ASSERT(buf_dirty == 0 || (buf_dirty && !no_modify));
                if (buf_dirty && !no_modify) {
                        *repair = 1;
-                       libxfs_buf_mark_dirty(bp, 0);
+                       libxfs_buf_mark_dirty(bp);
                        libxfs_buf_relse(bp);
                } else
                        libxfs_buf_relse(bp);
@@ -1341,7 +1341,7 @@ _("bad directory block magic # %#x in block %" PRIu64 " for directory inode %" P
                }
                if (dirty && !no_modify) {
                        *repair = 1;
-                       libxfs_buf_mark_dirty(bp, 0);
+                       libxfs_buf_mark_dirty(bp);
                        libxfs_buf_relse(bp);
                } else
                        libxfs_buf_relse(bp);
index 4e7fe9645914eec5119c6dcb36490cf053a9774d..79dc65f829bfa038c2a90faf68565d06ced39faa 100644 (file)
@@ -47,7 +47,7 @@ process_agi_unlinked(
        }
 
        if (agi_dirty) {
-               libxfs_buf_mark_dirty(bp, 0);
+               libxfs_buf_mark_dirty(bp);
                libxfs_buf_relse(bp);
        }
        else
index e31dedca0cb879c112a92c6549c0d6241482e430..7ec58f88776bf4839bd80c96b5ba8cfb7e54a02e 100644 (file)
@@ -321,10 +321,10 @@ write_cursor(bt_status_t *curs)
                        fprintf(stderr, "writing bt prev block %u\n",
                                                curs->level[i].prev_agbno);
 #endif
-                       libxfs_buf_mark_dirty(curs->level[i].prev_buf_p, 0);
+                       libxfs_buf_mark_dirty(curs->level[i].prev_buf_p);
                        libxfs_buf_relse(curs->level[i].prev_buf_p);
                }
-               libxfs_buf_mark_dirty(curs->level[i].buf_p, 0);
+               libxfs_buf_mark_dirty(curs->level[i].buf_p);
                libxfs_buf_relse(curs->level[i].buf_p);
        }
 }
@@ -683,7 +683,7 @@ prop_freespace_cursor(xfs_mount_t *mp, xfs_agnumber_t agno,
 #endif
                if (lptr->prev_agbno != NULLAGBLOCK) {
                        ASSERT(lptr->prev_buf_p != NULL);
-                       libxfs_buf_mark_dirty(lptr->prev_buf_p, 0);
+                       libxfs_buf_mark_dirty(lptr->prev_buf_p);
                        libxfs_buf_relse(lptr->prev_buf_p);
                }
                lptr->prev_agbno = lptr->agbno;;
@@ -873,7 +873,7 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno,
                                        lptr->prev_agbno);
 #endif
                                ASSERT(lptr->prev_agbno != NULLAGBLOCK);
-                               libxfs_buf_mark_dirty(lptr->prev_buf_p, 0);
+                               libxfs_buf_mark_dirty(lptr->prev_buf_p);
                                libxfs_buf_relse(lptr->prev_buf_p);
                        }
                        lptr->prev_buf_p = lptr->buf_p;
@@ -1050,7 +1050,7 @@ prop_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs,
 #endif
                if (lptr->prev_agbno != NULLAGBLOCK)  {
                        ASSERT(lptr->prev_buf_p != NULL);
-                       libxfs_buf_mark_dirty(lptr->prev_buf_p, 0);
+                       libxfs_buf_mark_dirty(lptr->prev_buf_p);
                        libxfs_buf_relse(lptr->prev_buf_p);
                }
                lptr->prev_agbno = lptr->agbno;;
@@ -1142,7 +1142,7 @@ build_agi(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs,
                agi->agi_free_level = cpu_to_be32(finobt_curs->num_levels);
        }
 
-       libxfs_buf_mark_dirty(agi_buf, 0);
+       libxfs_buf_mark_dirty(agi_buf);
        libxfs_buf_relse(agi_buf);
 }
 
@@ -1305,7 +1305,7 @@ nextrec:
                                        lptr->prev_agbno);
 #endif
                                ASSERT(lptr->prev_agbno != NULLAGBLOCK);
-                               libxfs_buf_mark_dirty(lptr->prev_buf_p, 0);
+                               libxfs_buf_mark_dirty(lptr->prev_buf_p);
                                libxfs_buf_relse(lptr->prev_buf_p);
                        }
                        lptr->prev_buf_p = lptr->buf_p;
@@ -1458,7 +1458,7 @@ prop_rmap_cursor(
 #endif
                if (lptr->prev_agbno != NULLAGBLOCK)  {
                        ASSERT(lptr->prev_buf_p != NULL);
-                       libxfs_buf_mark_dirty(lptr->prev_buf_p, 0);
+                       libxfs_buf_mark_dirty(lptr->prev_buf_p);
                        libxfs_buf_relse(lptr->prev_buf_p);
                }
                lptr->prev_agbno = lptr->agbno;
@@ -1669,7 +1669,7 @@ _("Insufficient memory to construct reverse-map cursor."));
                                        lptr->prev_agbno);
 #endif
                                ASSERT(lptr->prev_agbno != NULLAGBLOCK);
-                               libxfs_buf_mark_dirty(lptr->prev_buf_p, 0);
+                               libxfs_buf_mark_dirty(lptr->prev_buf_p);
                                libxfs_buf_relse(lptr->prev_buf_p);
                        }
                        lptr->prev_buf_p = lptr->buf_p;
@@ -1810,7 +1810,7 @@ prop_refc_cursor(
 #endif
                if (lptr->prev_agbno != NULLAGBLOCK)  {
                        ASSERT(lptr->prev_buf_p != NULL);
-                       libxfs_buf_mark_dirty(lptr->prev_buf_p, 0);
+                       libxfs_buf_mark_dirty(lptr->prev_buf_p);
                        libxfs_buf_relse(lptr->prev_buf_p);
                }
                lptr->prev_agbno = lptr->agbno;
@@ -1964,7 +1964,7 @@ _("Insufficient memory to construct refcount cursor."));
                                        lptr->prev_agbno);
 #endif
                                ASSERT(lptr->prev_agbno != NULLAGBLOCK);
-                               libxfs_buf_mark_dirty(lptr->prev_buf_p, 0);
+                               libxfs_buf_mark_dirty(lptr->prev_buf_p);
                                libxfs_buf_relse(lptr->prev_buf_p);
                        }
                        lptr->prev_buf_p = lptr->buf_p;
@@ -2153,7 +2153,7 @@ _("Insufficient memory saving lost blocks.\n"));
                agf->agf_flcount = 0;
        }
 
-       libxfs_buf_mark_dirty(agfl_buf, 0);
+       libxfs_buf_mark_dirty(agfl_buf);
        libxfs_buf_relse(agfl_buf);
 
        ext_ptr = findbiggest_bcnt_extent(agno);
@@ -2167,7 +2167,7 @@ _("Insufficient memory saving lost blocks.\n"));
        ASSERT(be32_to_cpu(agf->agf_refcount_root) !=
                be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNTi]));
 
-       libxfs_buf_mark_dirty(agf_buf, 0);
+       libxfs_buf_mark_dirty(agf_buf);
        libxfs_buf_relse(agf_buf);
 
        /*
@@ -2202,7 +2202,7 @@ sync_sb(xfs_mount_t *mp)
        update_sb_version(mp);
 
        libxfs_sb_to_disk(XFS_BUF_TO_SBP(bp), &mp->m_sb);
-       libxfs_buf_mark_dirty(bp, 0);
+       libxfs_buf_mark_dirty(bp);
        libxfs_buf_relse(bp);
 }
 
index b0b9874ed6fb4877b90a41e99dc7f2ecb6922bf7..a37efbe7c0ed3f617e5ecf3f99abde9a62a78dd3 100644 (file)
@@ -1231,7 +1231,7 @@ _("setting reflink flag on inode %"PRIu64"\n"),
        else
                dino->di_flags2 &= cpu_to_be64(~XFS_DIFLAG2_REFLINK);
        libxfs_dinode_calc_crc(mp, dino);
-       libxfs_buf_mark_dirty(buf, 0);
+       libxfs_buf_mark_dirty(buf);
        libxfs_buf_relse(buf);
 
        return 0;
index b2749ae7fd584128a7a23ef5ab481b6421c5d1a6..19dfb4878b2db669fcea98f1858071cbbbe089c6 100644 (file)
@@ -152,7 +152,7 @@ scan_lbtree(
        ASSERT(dirty == 0 || (dirty && !no_modify));
 
        if ((dirty || badcrc) && !no_modify) {
-               libxfs_buf_mark_dirty(bp, 0);
+               libxfs_buf_mark_dirty(bp);
                libxfs_buf_relse(bp);
        }
        else
@@ -2428,14 +2428,14 @@ scan_ag(
        }
 
        if (agi_dirty && !no_modify) {
-               libxfs_buf_mark_dirty(agibuf, 0);
+               libxfs_buf_mark_dirty(agibuf);
                libxfs_buf_relse(agibuf);
        }
        else
                libxfs_buf_relse(agibuf);
 
        if (agf_dirty && !no_modify) {
-               libxfs_buf_mark_dirty(agfbuf, 0);
+               libxfs_buf_mark_dirty(agfbuf);
                libxfs_buf_relse(agfbuf);
        }
        else
@@ -2445,7 +2445,7 @@ scan_ag(
                if (agno == 0)
                        memcpy(&mp->m_sb, sb, sizeof(xfs_sb_t));
                libxfs_sb_to_disk(XFS_BUF_TO_SBP(sbbuf), sb);
-               libxfs_buf_mark_dirty(sbbuf, 0);
+               libxfs_buf_mark_dirty(sbbuf);
                libxfs_buf_relse(sbbuf);
        } else
                libxfs_buf_relse(sbbuf);
index e297fe32614fd426b6e968c6eb7188054c649a8d..4d37ddc64906231e98f714713ba5da4563627813 100644 (file)
@@ -1096,7 +1096,7 @@ _("Note - stripe unit (%d) and width (%d) were copied from a backup superblock.\
                        be32_to_cpu(dsb->sb_unit), be32_to_cpu(dsb->sb_width));
        }
 
-       libxfs_buf_mark_dirty(sbp, 0);
+       libxfs_buf_mark_dirty(sbp);
        libxfs_buf_relse(sbp);
 
        /*