btrfs: add test for multiple fsync with adjacent preallocated extents
[xfstests-dev.git] / ltp / fsstress.c
index 279da9f185e612f4f470a35c7d1dc84ae7fb3d5f..b4ddf5e2ef35eadf578d4e38649c4641da9fa7bf 100644 (file)
@@ -8,24 +8,29 @@
 #include <setjmp.h>
 #include <sys/uio.h>
 #include <stddef.h>
+#include <stdbool.h>
 #include "global.h"
 
-#ifdef HAVE_ATTR_ATTRIBUTES_H
-#include <attr/attributes.h>
+#ifdef HAVE_BTRFSUTIL_H
+#include <btrfsutil.h>
 #endif
 #ifdef HAVE_LINUX_FIEMAP_H
 #include <linux/fiemap.h>
 #endif
-#ifndef HAVE_ATTR_LIST
-#define attr_list(path, buf, size, flags, cursor) (errno = -ENOSYS, -1)
-#endif
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif
 #ifdef AIO
 #include <libaio.h>
+#define AIO_ENTRIES    1
 io_context_t   io_ctx;
 #endif
+#ifdef URING
+#include <liburing.h>
+#define URING_ENTRIES  1
+struct io_uring        ring;
+bool have_io_uring;                    /* to indicate runtime availability */
+#endif
 #include <sys/syscall.h>
 #include <sys/xattr.h>
 
@@ -44,6 +49,38 @@ io_context_t io_ctx;
 #define IOV_MAX 1024
 #endif
 
+#ifndef HAVE_RENAMEAT2
+#if !defined(SYS_renameat2) && defined(__x86_64__)
+#define SYS_renameat2 316
+#endif
+
+#if !defined(SYS_renameat2) && defined(__i386__)
+#define SYS_renameat2 353
+#endif
+
+static int renameat2(int dfd1, const char *path1,
+                    int dfd2, const char *path2,
+                    unsigned int flags)
+{
+#ifdef SYS_renameat2
+       return syscall(SYS_renameat2, dfd1, path1, dfd2, path2, flags);
+#else
+       errno = ENOSYS;
+       return -1;
+#endif
+}
+#endif
+
+#ifndef RENAME_NOREPLACE
+#define RENAME_NOREPLACE       (1 << 0)        /* Don't overwrite target */
+#endif
+#ifndef RENAME_EXCHANGE
+#define RENAME_EXCHANGE                (1 << 1)        /* Exchange source and dest */
+#endif
+#ifndef RENAME_WHITEOUT
+#define RENAME_WHITEOUT                (1 << 2)        /* Whiteout source */
+#endif
+
 #define FILELEN_MAX            (32*4096)
 
 typedef enum {
@@ -85,18 +122,26 @@ typedef enum {
        OP_READV,
        OP_REMOVEFATTR,
        OP_RENAME,
+       OP_RNOREPLACE,
+       OP_REXCHANGE,
+       OP_RWHITEOUT,
        OP_RESVSP,
        OP_RMDIR,
        OP_SETATTR,
        OP_SETFATTR,
        OP_SETXATTR,
+       OP_SNAPSHOT,
        OP_SPLICE,
        OP_STAT,
+       OP_SUBVOL_CREATE,
+       OP_SUBVOL_DELETE,
        OP_SYMLINK,
        OP_SYNC,
        OP_TRUNCATE,
        OP_UNLINK,
        OP_UNRESVSP,
+       OP_URING_READ,
+       OP_URING_WRITE,
        OP_WRITE,
        OP_WRITEV,
        OP_LAST
@@ -114,6 +159,7 @@ typedef struct opdesc {
 
 typedef struct fent {
        int     id;
+       int     ft;
        int     parent;
        int     xattr_counter;
 } fent_t;
@@ -141,20 +187,23 @@ struct print_string {
        int max;
 };
 
-#define        FT_DIR  0
-#define        FT_DIRm (1 << FT_DIR)
-#define        FT_REG  1
-#define        FT_REGm (1 << FT_REG)
-#define        FT_SYM  2
-#define        FT_SYMm (1 << FT_SYM)
-#define        FT_DEV  3
-#define        FT_DEVm (1 << FT_DEV)
-#define        FT_RTF  4
-#define        FT_RTFm (1 << FT_RTF)
-#define        FT_nft  5
-#define        FT_ANYm ((1 << FT_nft) - 1)
+#define        FT_DIR          0
+#define        FT_DIRm         (1 << FT_DIR)
+#define        FT_REG          1
+#define        FT_REGm         (1 << FT_REG)
+#define        FT_SYM          2
+#define        FT_SYMm         (1 << FT_SYM)
+#define        FT_DEV          3
+#define        FT_DEVm         (1 << FT_DEV)
+#define        FT_RTF          4
+#define        FT_RTFm         (1 << FT_RTF)
+#define        FT_SUBVOL       5
+#define        FT_SUBVOLm      (1 << FT_SUBVOL)
+#define        FT_nft          6
+#define        FT_ANYm         ((1 << FT_nft) - 1)
 #define        FT_REGFILE      (FT_REGm | FT_RTFm)
-#define        FT_NOTDIR       (FT_ANYm & ~FT_DIRm)
+#define        FT_NOTDIR       (FT_ANYm & (~FT_DIRm & ~FT_SUBVOLm))
+#define        FT_ANYDIR       (FT_DIRm | FT_SUBVOLm)
 
 #define        FLIST_SLOT_INCR 16
 #define        NDCACHE 64
@@ -203,18 +252,26 @@ void      readlink_f(int, long);
 void   readv_f(int, long);
 void   removefattr_f(int, long);
 void   rename_f(int, long);
+void   rnoreplace_f(int, long);
+void   rexchange_f(int, long);
+void   rwhiteout_f(int, long);
 void   resvsp_f(int, long);
 void   rmdir_f(int, long);
 void   setattr_f(int, long);
 void   setfattr_f(int, long);
 void   setxattr_f(int, long);
+void   snapshot_f(int, long);
 void   splice_f(int, long);
 void   stat_f(int, long);
+void   subvol_create_f(int, long);
+void   subvol_delete_f(int, long);
 void   symlink_f(int, long);
 void   sync_f(int, long);
 void   truncate_f(int, long);
 void   unlink_f(int, long);
 void   unresvsp_f(int, long);
+void   uring_read_f(int, long);
+void   uring_write_f(int, long);
 void   write_f(int, long);
 void   writev_f(int, long);
 char   *xattr_flag_to_string(int);
@@ -262,6 +319,9 @@ opdesc_t    ops[] = {
        /* remove (delete) extended attribute */
        { OP_REMOVEFATTR, "removefattr", removefattr_f, 1, 1 },
        { OP_RENAME, "rename", rename_f, 2, 1 },
+       { OP_RNOREPLACE, "rnoreplace", rnoreplace_f, 2, 1 },
+       { OP_REXCHANGE, "rexchange", rexchange_f, 2, 1 },
+       { OP_RWHITEOUT, "rwhiteout", rwhiteout_f, 2, 1 },
        { OP_RESVSP, "resvsp", resvsp_f, 1, 1 },
        { OP_RMDIR, "rmdir", rmdir_f, 1, 1 },
        /* set attribute flag (FS_IOC_SETFLAGS ioctl) */
@@ -270,13 +330,18 @@ opdesc_t  ops[] = {
        { OP_SETFATTR, "setfattr", setfattr_f, 2, 1 },
        /* set project id (XFS_IOC_FSSETXATTR ioctl) */
        { OP_SETXATTR, "setxattr", setxattr_f, 1, 1 },
+       { OP_SNAPSHOT, "snapshot", snapshot_f, 1, 1 },
        { OP_SPLICE, "splice", splice_f, 1, 1 },
        { OP_STAT, "stat", stat_f, 1, 0 },
+       { OP_SUBVOL_CREATE, "subvol_create", subvol_create_f, 1, 1},
+       { OP_SUBVOL_DELETE, "subvol_delete", subvol_delete_f, 1, 1},
        { OP_SYMLINK, "symlink", symlink_f, 2, 1 },
        { OP_SYNC, "sync", sync_f, 1, 1 },
        { OP_TRUNCATE, "truncate", truncate_f, 2, 1 },
        { OP_UNLINK, "unlink", unlink_f, 1, 1 },
        { OP_UNRESVSP, "unresvsp", unresvsp_f, 1, 1 },
+       { OP_URING_READ, "uring_read", uring_read_f, 1, 0 },
+       { OP_URING_WRITE, "uring_write", uring_write_f, 1, 1 },
        { OP_WRITE, "write", write_f, 4, 1 },
        { OP_WRITEV, "writev", writev_f, 4, 1 },
 }, *ops_end;
@@ -287,6 +352,7 @@ flist_t     flist[FT_nft] = {
        { 0, 0, 'l', NULL },
        { 0, 0, 'c', NULL },
        { 0, 0, 'r', NULL },
+       { 0, 0, 's', NULL },
 };
 
 int            dcache[NDCACHE];
@@ -322,21 +388,22 @@ struct print_string       flag_str = {0};
 
 void   add_to_flist(int, int, int, int);
 void   append_pathname(pathname_t *, char *);
-int    attr_list_path(pathname_t *, char *, const int, int, attrlist_cursor_t *);
-int    attr_remove_path(pathname_t *, const char *, int);
-int    attr_set_path(pathname_t *, const char *, const char *, const int, int);
+int    attr_list_path(pathname_t *, char *, const int);
+int    attr_remove_path(pathname_t *, const char *);
+int    attr_set_path(pathname_t *, const char *, const char *, const int);
 void   check_cwd(void);
 void   cleanup_flist(void);
 int    creat_path(pathname_t *, mode_t);
 void   dcache_enter(int, int);
 void   dcache_init(void);
 fent_t *dcache_lookup(int);
-void   dcache_purge(int);
+void   dcache_purge(int, int);
 void   del_from_flist(int, int);
 int    dirid_to_name(char *, int);
 void   doproc(void);
-int    fent_to_name(pathname_t *, flist_t *, fent_t *);
-void   fix_parent(int, int);
+int    fent_to_name(pathname_t *, fent_t *);
+bool   fents_ancestor_check(fent_t *, fent_t *);
+void   fix_parent(int, int, bool);
 void   free_pathname(pathname_t *);
 int    generate_fname(fent_t *, int, pathname_t *, int *, int *);
 int    generate_xattr_name(int, char *, int);
@@ -354,7 +421,7 @@ int open_path(pathname_t *, int);
 DIR    *opendir_path(pathname_t *);
 void   process_freq(char *);
 int    readlink_path(pathname_t *, char *, size_t);
-int    rename_path(pathname_t *, pathname_t *);
+int    rename_path(pathname_t *, pathname_t *, int);
 int    rmdir_path(pathname_t *);
 void   separate_pathname(pathname_t *, char *, pathname_t *);
 void   show_ops(int, char *);
@@ -365,6 +432,7 @@ int unlink_path(pathname_t *);
 void   usage(void);
 void   write_freq(void);
 void   zero_freq(void);
+void   non_btrfs_freq(const char *);
 
 void sg_handler(int signum)
 {
@@ -518,6 +586,7 @@ int main(int argc, char **argv)
             exit(1);
         }
 
+       non_btrfs_freq(dirname);
        (void)mkdir(dirname, 0777);
        if (logname && logname[0] != '/') {
                if (!getcwd(rpath, sizeof(rpath))){
@@ -626,10 +695,22 @@ int main(int argc, char **argv)
                        }
                        procid = i;
 #ifdef AIO
-                       if (io_setup(128, &io_ctx) != 0) {
-                               fprintf(stderr, "io_setup failed");
+                       if (io_setup(AIO_ENTRIES, &io_ctx) != 0) {
+                               fprintf(stderr, "io_setup failed\n");
                                exit(1);
                        }
+#endif
+#ifdef URING
+                       have_io_uring = true;
+                       /* If ENOSYS, just ignore uring, other errors are fatal. */
+                       if (io_uring_queue_init(URING_ENTRIES, &ring, 0)) {
+                               if (errno == ENOSYS) {
+                                       have_io_uring = false;
+                               } else {
+                                       fprintf(stderr, "io_uring_queue_init failed\n");
+                                       exit(1);
+                               }
+                       }
 #endif
                        for (i = 0; !loops || (i < loops); i++)
                                doproc();
@@ -639,7 +720,10 @@ int main(int argc, char **argv)
                                return 1;
                        }
 #endif
-
+#ifdef URING
+                       if (have_io_uring)
+                               io_uring_queue_exit(&ring);
+#endif
                        cleanup_flist();
                        free(freq_table);
                        return 0;
@@ -753,6 +837,7 @@ add_to_flist(int ft, int id, int parent, int xattr_counter)
        }
        fep = &ftp->fents[ftp->nfiles++];
        fep->id = id;
+       fep->ft = ft;
        fep->parent = parent;
        fep->xattr_counter = xattr_counter;
 }
@@ -777,28 +862,36 @@ append_pathname(pathname_t *name, char *str)
        name->len += len;
 }
 
+int
+attr_list_count(char *buffer, int buffersize)
+{
+       char *p = buffer;
+       char *end = buffer + buffersize;
+       int count = 0;
+
+       while (p < end && *p != 0) {
+               count++;
+               p += strlen(p) + 1;
+       }
+
+       return count;
+}
+
 int
 attr_list_path(pathname_t *name,
               char *buffer,
-              const int buffersize,
-              int flags,
-              attrlist_cursor_t *cursor)
+              const int buffersize)
 {
        char            buf[NAME_MAX + 1];
        pathname_t      newname;
        int             rval;
 
-       if (flags != ATTR_DONTFOLLOW) {
-               errno = EINVAL;
-               return -1;
-       }
-
-       rval = attr_list(name->path, buffer, buffersize, flags, cursor);
+       rval = llistxattr(name->path, buffer, buffersize);
        if (rval >= 0 || errno != ENAMETOOLONG)
                return rval;
        separate_pathname(name, buf, &newname);
        if (chdir(buf) == 0) {
-               rval = attr_list_path(&newname, buffer, buffersize, flags, cursor);
+               rval = attr_list_path(&newname, buffer, buffersize);
                assert(chdir("..") == 0);
        }
        free_pathname(&newname);
@@ -806,18 +899,18 @@ attr_list_path(pathname_t *name,
 }
 
 int
-attr_remove_path(pathname_t *name, const char *attrname, int flags)
+attr_remove_path(pathname_t *name, const char *attrname)
 {
        char            buf[NAME_MAX + 1];
        pathname_t      newname;
        int             rval;
 
-       rval = attr_remove(name->path, attrname, flags);
+       rval = lremovexattr(name->path, attrname);
        if (rval >= 0 || errno != ENAMETOOLONG)
                return rval;
        separate_pathname(name, buf, &newname);
        if (chdir(buf) == 0) {
-               rval = attr_remove_path(&newname, attrname, flags);
+               rval = attr_remove_path(&newname, attrname);
                assert(chdir("..") == 0);
        }
        free_pathname(&newname);
@@ -826,19 +919,19 @@ attr_remove_path(pathname_t *name, const char *attrname, int flags)
 
 int
 attr_set_path(pathname_t *name, const char *attrname, const char *attrvalue,
-             const int valuelength, int flags)
+             const int valuelength)
 {
        char            buf[NAME_MAX + 1];
        pathname_t      newname;
        int             rval;
 
-       rval = attr_set(name->path, attrname, attrvalue, valuelength, flags);
+       rval = lsetxattr(name->path, attrname, attrvalue, valuelength, 0);
        if (rval >= 0 || errno != ENAMETOOLONG)
                return rval;
        separate_pathname(name, buf, &newname);
        if (chdir(buf) == 0) {
-               rval = attr_set_path(&newname, attrname, attrvalue, valuelength,
-                       flags);
+               rval = attr_set_path(&newname, attrname, attrvalue,
+                                    valuelength);
                assert(chdir("..") == 0);
        }
        free_pathname(&newname);
@@ -920,18 +1013,22 @@ dcache_lookup(int dirid)
        int     i;
 
        i = dcache[dirid % NDCACHE];
-       if (i >= 0 && (fep = &flist[FT_DIR].fents[i])->id == dirid)
+       if (i >= 0 && i < flist[FT_DIR].nfiles &&
+           (fep = &flist[FT_DIR].fents[i])->id == dirid)
+               return fep;
+       if (i >= 0 && i < flist[FT_SUBVOL].nfiles &&
+           (fep = &flist[FT_SUBVOL].fents[i])->id == dirid)
                return fep;
        return NULL;
 }
 
 void
-dcache_purge(int dirid)
+dcache_purge(int dirid, int ft)
 {
        int     *dcp;
-
        dcp = &dcache[dirid % NDCACHE];
-       if (*dcp >= 0 && flist[FT_DIR].fents[*dcp].id == dirid)
+       if (*dcp >= 0 && *dcp < flist[ft].nfiles &&
+           flist[ft].fents[*dcp].id == dirid)
                *dcp = -1;
 }
 
@@ -947,32 +1044,58 @@ del_from_flist(int ft, int slot)
        flist_t *ftp;
 
        ftp = &flist[ft];
-       if (ft == FT_DIR)
-               dcache_purge(ftp->fents[slot].id);
+       if (ft == FT_DIR || ft == FT_SUBVOL)
+               dcache_purge(ftp->fents[slot].id, ft);
        if (slot != ftp->nfiles - 1) {
-               if (ft == FT_DIR)
-                       dcache_purge(ftp->fents[ftp->nfiles - 1].id);
+               if (ft == FT_DIR || ft == FT_SUBVOL)
+                       dcache_purge(ftp->fents[ftp->nfiles - 1].id, ft);
                ftp->fents[slot] = ftp->fents[--ftp->nfiles];
        } else
                ftp->nfiles--;
 }
 
+void
+delete_subvol_children(int parid)
+{
+       flist_t *flp;
+       int     i;
+again:
+       for (i = 0, flp = flist; i < FT_nft; i++, flp++) {
+               int c;
+               for (c = 0; c < flp->nfiles; c++) {
+                       if (flp->fents[c].parent == parid) {
+                               int id = flp->fents[c].id;
+                               del_from_flist(i, c);
+                               if (i == FT_DIR || i == FT_SUBVOL)
+                                       delete_subvol_children(id);
+                               goto again;
+                       }
+               }
+       }
+}
+
 fent_t *
 dirid_to_fent(int dirid)
 {
        fent_t  *efep;
        fent_t  *fep;
        flist_t *flp;
+       int     ft = FT_DIR;
 
        if ((fep = dcache_lookup(dirid)))
                return fep;
-       flp = &flist[FT_DIR];
+again:
+       flp = &flist[ft];
        for (fep = flp->fents, efep = &fep[flp->nfiles]; fep < efep; fep++) {
                if (fep->id == dirid) {
                        dcache_enter(dirid, fep - flp->fents);
                        return fep;
                }
        }
+       if (ft == FT_DIR) {
+               ft = FT_SUBVOL;
+               goto again;
+       }
        return NULL;
 }
 
@@ -1049,8 +1172,9 @@ errout:
  * Return 0 on error, 1 on success;
  */
 int
-fent_to_name(pathname_t *name, flist_t *flp, fent_t *fep)
+fent_to_name(pathname_t *name, fent_t *fep)
 {
+       flist_t *flp = &flist[fep->ft];
        char    buf[NAME_MAX + 1];
        int     i;
        fent_t  *pfep;
@@ -1070,7 +1194,7 @@ fent_to_name(pathname_t *name, flist_t *flp, fent_t *fep)
 #endif
                if (pfep == NULL)
                        return 0;
-               e = fent_to_name(name, &flist[FT_DIR], pfep);
+               e = fent_to_name(name, pfep);
                if (!e)
                        return 0;
                append_pathname(name, "/");
@@ -1082,8 +1206,22 @@ fent_to_name(pathname_t *name, flist_t *flp, fent_t *fep)
        return 1;
 }
 
+bool
+fents_ancestor_check(fent_t *fep, fent_t *dfep)
+{
+       fent_t  *tmpfep;
+
+       for (tmpfep = fep; tmpfep->parent != -1;
+            tmpfep = dirid_to_fent(tmpfep->parent)) {
+               if (tmpfep->parent == dfep->id)
+                       return true;
+       }
+
+       return false;
+}
+
 void
-fix_parent(int oldid, int newid)
+fix_parent(int oldid, int newid, bool swap)
 {
        fent_t  *fep;
        flist_t *flp;
@@ -1094,6 +1232,8 @@ fix_parent(int oldid, int newid)
                for (j = 0, fep = flp->fents; j < flp->nfiles; j++, fep++) {
                        if (fep->parent == oldid)
                                fep->parent = newid;
+                       else if (swap && fep->parent == newid)
+                               fep->parent = oldid;
                }
        }
 }
@@ -1130,7 +1270,7 @@ generate_fname(fent_t *fep, int ft, pathname_t *name, int *idp, int *v)
 
        /* prepend fep parent dir-name to it */
        if (fep) {
-               e = fent_to_name(name, &flist[FT_DIR], fep);
+               e = fent_to_name(name, fep);
                if (!e)
                        return 0;
                append_pathname(name, "/");
@@ -1212,7 +1352,7 @@ get_fname(int which, long r, pathname_t *name, flist_t **flpp, fent_t **fepp,
 
                                /* fill-in what we were asked for */
                                if (name) {
-                                       e = fent_to_name(name, flp, fep);
+                                       e = fent_to_name(name, fep);
 #ifdef DEBUG
                                        if (!e) {
                                                fprintf(stderr, "%d: failed to get path for entry:"
@@ -1519,7 +1659,7 @@ readlink_path(pathname_t *name, char *lbuf, size_t lbufsiz)
 }
 
 int
-rename_path(pathname_t *name1, pathname_t *name2)
+rename_path(pathname_t *name1, pathname_t *name2, int mode)
 {
        char            buf1[NAME_MAX + 1];
        char            buf2[NAME_MAX + 1];
@@ -1528,14 +1668,18 @@ rename_path(pathname_t *name1, pathname_t *name2)
        pathname_t      newname2;
        int             rval;
 
-       rval = rename(name1->path, name2->path);
+       if (mode == 0)
+               rval = rename(name1->path, name2->path);
+       else
+               rval = renameat2(AT_FDCWD, name1->path,
+                                AT_FDCWD, name2->path, mode);
        if (rval >= 0 || errno != ENAMETOOLONG)
                return rval;
        separate_pathname(name1, buf1, &newname1);
        separate_pathname(name2, buf2, &newname2);
        if (strcmp(buf1, buf2) == 0) {
                if (chdir(buf1) == 0) {
-                       rval = rename_path(&newname1, &newname2);
+                       rval = rename_path(&newname1, &newname2, mode);
                        assert(chdir("..") == 0);
                }
        } else {
@@ -1555,7 +1699,7 @@ rename_path(pathname_t *name1, pathname_t *name2)
                        append_pathname(&newname2, "../");
                        append_pathname(&newname2, name2->path);
                        if (chdir(buf1) == 0) {
-                               rval = rename_path(&newname1, &newname2);
+                               rval = rename_path(&newname1, &newname2, mode);
                                assert(chdir("..") == 0);
                        }
                } else {
@@ -1563,7 +1707,7 @@ rename_path(pathname_t *name1, pathname_t *name2)
                        append_pathname(&newname1, "../");
                        append_pathname(&newname1, name1->path);
                        if (chdir(buf2) == 0) {
-                               rval = rename_path(&newname1, &newname2);
+                               rval = rename_path(&newname1, &newname2, mode);
                                assert(chdir("..") == 0);
                        }
                }
@@ -1790,6 +1934,36 @@ zero_freq(void)
                p->freq = 0;
 }
 
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+opty_t btrfs_ops[] = {
+       OP_SNAPSHOT,
+       OP_SUBVOL_CREATE,
+       OP_SUBVOL_DELETE,
+};
+
+void
+non_btrfs_freq(const char *path)
+{
+       opdesc_t                *p;
+#ifdef HAVE_BTRFSUTIL_H
+       enum btrfs_util_error   e;
+
+       e = btrfs_util_is_subvolume(path);
+       if (e != BTRFS_UTIL_ERROR_NOT_BTRFS)
+               return;
+#endif
+       for (p = ops; p < ops_end; p++) {
+               int i;
+               for (i = 0; i < ARRAY_SIZE(btrfs_ops); i++) {
+                       if (p->op == btrfs_ops[i]) {
+                               p->freq = 0;
+                               break;
+                       }
+               }
+       }
+}
+
 void inode_info(char *str, size_t sz, struct stat64 *s, int verbose)
 {
        if (verbose)
@@ -1914,11 +2088,11 @@ void
 do_aio_rw(int opno, long r, int flags)
 {
        int64_t         align;
-       char            *buf;
+       char            *buf = NULL;
        struct dioattr  diob;
        int             e;
        pathname_t      f;
-       int             fd;
+       int             fd = -1;
        size_t          len;
        int64_t         lr;
        off64_t         off;
@@ -1935,8 +2109,7 @@ do_aio_rw(int opno, long r, int flags)
        if (!get_fname(FT_REGFILE, r, &f, NULL, NULL, &v)) {
                if (v)
                        printf("%d/%d: do_aio_rw - no filename\n", procid, opno);
-               free_pathname(&f);
-               return;
+               goto aio_out;
        }
        fd = open_path(&f, flags|O_DIRECT);
        e = fd < 0 ? errno : 0;
@@ -1945,25 +2118,20 @@ do_aio_rw(int opno, long r, int flags)
                if (v)
                        printf("%d/%d: do_aio_rw - open %s failed %d\n",
                               procid, opno, f.path, e);
-               free_pathname(&f);
-               return;
+               goto aio_out;
        }
        if (fstat64(fd, &stb) < 0) {
                if (v)
                        printf("%d/%d: do_aio_rw - fstat64 %s failed %d\n",
                               procid, opno, f.path, errno);
-               free_pathname(&f);
-               close(fd);
-               return;
+               goto aio_out;
        }
        inode_info(st, sizeof(st), &stb, v);
        if (!iswrite && stb.st_size == 0) {
                if (v)
                        printf("%d/%d: do_aio_rw - %s%s zero size\n", procid, opno,
                               f.path, st);
-               free_pathname(&f);
-               close(fd);
-               return;
+               goto aio_out;
        }
        if (xfsctl(f.path, fd, XFS_IOC_DIOINFO, &diob) < 0) {
                if (v)
@@ -1972,7 +2140,7 @@ do_aio_rw(int opno, long r, int flags)
                        " fallback to stat()\n",
                                procid, opno, f.path, st, errno);
                diob.d_mem = diob.d_miniosz = stb.st_blksize;
-               diob.d_maxiosz = INT_MAX & ~(diob.d_miniosz - 1);
+               diob.d_maxiosz = rounddown_64(INT_MAX, diob.d_miniosz);
        }
        dio_env = getenv("XFS_DIO_MIN");
        if (dio_env)
@@ -1986,6 +2154,12 @@ do_aio_rw(int opno, long r, int flags)
        else if (len > diob.d_maxiosz)
                len = diob.d_maxiosz;
        buf = memalign(diob.d_mem, len);
+       if (!buf) {
+               if (v)
+                       printf("%d/%d: do_aio_rw - memalign failed\n",
+                              procid, opno);
+               goto aio_out;
+       }
 
        if (iswrite) {
                off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
@@ -2002,27 +2176,131 @@ do_aio_rw(int opno, long r, int flags)
                if (v)
                        printf("%d/%d: %s - io_submit failed %d\n",
                               procid, opno, iswrite ? "awrite" : "aread", e);
-               free_pathname(&f);
-               close(fd);
-               return;
+               goto aio_out;
        }
        if ((e = io_getevents(io_ctx, 1, 1, &event, NULL)) != 1) {
                if (v)
                        printf("%d/%d: %s - io_getevents failed %d\n",
                               procid, opno, iswrite ? "awrite" : "aread", e);
-               free_pathname(&f);
-               close(fd);
-               return;
+               goto aio_out;
        }
 
        e = event.res != len ? event.res2 : 0;
-       free(buf);
        if (v)
                printf("%d/%d: %s %s%s [%lld,%d] %d\n",
                       procid, opno, iswrite ? "awrite" : "aread",
                       f.path, st, (long long)off, (int)len, e);
+ aio_out:
+       if (buf)
+               free(buf);
+       if (fd != -1)
+               close(fd);
+       free_pathname(&f);
+}
+#endif
+
+#ifdef URING
+void
+do_uring_rw(int opno, long r, int flags)
+{
+       char            *buf = NULL;
+       int             e;
+       pathname_t      f;
+       int             fd = -1;
+       size_t          len;
+       int64_t         lr;
+       off64_t         off;
+       struct stat64   stb;
+       int             v;
+       char            st[1024];
+       struct io_uring_sqe     *sqe;
+       struct io_uring_cqe     *cqe;
+       struct iovec    iovec;
+       int             iswrite = (flags & (O_WRONLY | O_RDWR)) ? 1 : 0;
+
+       if (!have_io_uring)
+               return;
+
+       init_pathname(&f);
+       if (!get_fname(FT_REGFILE, r, &f, NULL, NULL, &v)) {
+               if (v)
+                       printf("%d/%d: do_uring_rw - no filename\n", procid, opno);
+               goto uring_out;
+       }
+       fd = open_path(&f, flags);
+       e = fd < 0 ? errno : 0;
+       check_cwd();
+       if (fd < 0) {
+               if (v)
+                       printf("%d/%d: do_uring_rw - open %s failed %d\n",
+                              procid, opno, f.path, e);
+               goto uring_out;
+       }
+       if (fstat64(fd, &stb) < 0) {
+               if (v)
+                       printf("%d/%d: do_uring_rw - fstat64 %s failed %d\n",
+                              procid, opno, f.path, errno);
+               goto uring_out;
+       }
+       inode_info(st, sizeof(st), &stb, v);
+       if (!iswrite && stb.st_size == 0) {
+               if (v)
+                       printf("%d/%d: do_uring_rw - %s%s zero size\n", procid, opno,
+                              f.path, st);
+               goto uring_out;
+       }
+       sqe = io_uring_get_sqe(&ring);
+       if (!sqe) {
+               if (v)
+                       printf("%d/%d: do_uring_rw - io_uring_get_sqe failed\n",
+                              procid, opno);
+               goto uring_out;
+       }
+       lr = ((int64_t)random() << 32) + random();
+       len = (random() % FILELEN_MAX) + 1;
+       buf = malloc(len);
+       if (!buf) {
+               if (v)
+                       printf("%d/%d: do_uring_rw - malloc failed\n",
+                              procid, opno);
+               goto uring_out;
+       }
+       iovec.iov_base = buf;
+       iovec.iov_len = len;
+       if (iswrite) {
+               off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
+               off %= maxfsize;
+               memset(buf, nameseq & 0xff, len);
+               io_uring_prep_writev(sqe, fd, &iovec, 1, off);
+       } else {
+               off = (off64_t)(lr % stb.st_size);
+               io_uring_prep_readv(sqe, fd, &iovec, 1, off);
+       }
+
+       if ((e = io_uring_submit_and_wait(&ring, 1)) != 1) {
+               if (v)
+                       printf("%d/%d: %s - io_uring_submit failed %d\n", procid, opno,
+                              iswrite ? "uring_write" : "uring_read", e);
+               goto uring_out;
+       }
+       if ((e = io_uring_wait_cqe(&ring, &cqe)) < 0) {
+               if (v)
+                       printf("%d/%d: %s - io_uring_wait_cqe failed %d\n", procid, opno,
+                              iswrite ? "uring_write" : "uring_read", e);
+               goto uring_out;
+       }
+       if (v)
+               printf("%d/%d: %s %s%s [%lld, %d(res=%d)] %d\n",
+                      procid, opno, iswrite ? "uring_write" : "uring_read",
+                      f.path, st, (long long)off, (int)len, cqe->res, e);
+       io_uring_cqe_seen(&ring, cqe);
+
+ uring_out:
+       if (buf)
+               free(buf);
+       if (fd != -1)
+               close(fd);
        free_pathname(&f);
-       close(fd);
 }
 #endif
 
@@ -2037,32 +2315,24 @@ aread_f(int opno, long r)
 void
 attr_remove_f(int opno, long r)
 {
-       attrlist_ent_t          *aep;
-       attrlist_t              *alist;
-       char                    *aname;
-       char                    buf[4096];
-       attrlist_cursor_t       cursor;
+       char                    *bufname;
+       char                    *bufend;
+       char                    *aname = NULL;
+       char                    buf[XATTR_LIST_MAX];
        int                     e;
        int                     ent;
        pathname_t              f;
-       int                     total;
+       int                     total = 0;
        int                     v;
        int                     which;
 
        init_pathname(&f);
        if (!get_fname(FT_ANYm, r, &f, NULL, NULL, &v))
                append_pathname(&f, ".");
-       total = 0;
-       bzero(&cursor, sizeof(cursor));
-       do {
-               bzero(buf, sizeof(buf));
-               e = attr_list_path(&f, buf, sizeof(buf), ATTR_DONTFOLLOW, &cursor);
-               check_cwd();
-               if (e)
-                       break;
-               alist = (attrlist_t *)buf;
-               total += alist->al_count;
-       } while (alist->al_more);
+       e = attr_list_path(&f, buf, sizeof(buf));
+       check_cwd();
+       if (e > 0)
+               total = attr_list_count(buf, e);
        if (total == 0) {
                if (v)
                        printf("%d/%d: attr_remove - no attrs for %s\n",
@@ -2070,25 +2340,19 @@ attr_remove_f(int opno, long r)
                free_pathname(&f);
                return;
        }
+
        which = (int)(random() % total);
-       bzero(&cursor, sizeof(cursor));
+       bufname = buf;
+       bufend = buf + e;
        ent = 0;
-       aname = NULL;
-       do {
-               bzero(buf, sizeof(buf));
-               e = attr_list_path(&f, buf, sizeof(buf), ATTR_DONTFOLLOW, &cursor);
-               check_cwd();
-               if (e)
-                       break;
-               alist = (attrlist_t *)buf;
-               if (which < ent + alist->al_count) {
-                       aep = (attrlist_ent_t *)
-                               &buf[alist->al_offset[which - ent]];
-                       aname = aep->a_name;
+       while (bufname < bufend) {
+               if (which < ent) {
+                       aname = bufname;
                        break;
                }
-               ent += alist->al_count;
-       } while (alist->al_more);
+               ent++;
+               bufname += strlen(bufname) + 1;
+       }
        if (aname == NULL) {
                if (v)
                        printf(
@@ -2097,7 +2361,10 @@ attr_remove_f(int opno, long r)
                free_pathname(&f);
                return;
        }
-       e = attr_remove_path(&f, aname, ATTR_DONTFOLLOW) < 0 ? errno : 0;
+       if (attr_remove_path(&f, aname) < 0)
+               e = errno;
+       else
+               e = 0;
        check_cwd();
        if (v)
                printf("%d/%d: attr_remove %s %s %d\n",
@@ -2127,8 +2394,10 @@ attr_set_f(int opno, long r)
                len = 1;
        aval = malloc(len);
        memset(aval, nameseq & 0xff, len);
-       e = attr_set_path(&f, aname, aval, len, ATTR_DONTFOLLOW) < 0 ?
-               errno : 0;
+       if (attr_set_path(&f, aname, aval, len) < 0)
+               e = errno;
+       else
+               e = 0;
        check_cwd();
        free(aval);
        if (v)
@@ -2152,9 +2421,9 @@ bulkstat_f(int opno, long r)
        int             fd;
        __u64           last;
        int             nent;
-       xfs_bstat_t     *t;
+       struct xfs_bstat        *t;
        int64_t         total;
-        xfs_fsop_bulkreq_t bsr;
+       struct xfs_fsop_bulkreq bsr;
 
        last = 0;
        nent = (r % 999) + 2;
@@ -2185,9 +2454,9 @@ bulkstat1_f(int opno, long r)
        int             good;
        __u64           ino;
        struct stat64   s;
-       xfs_bstat_t     t;
+       struct xfs_bstat        t;
        int             v;
-        xfs_fsop_bulkreq_t bsr;
+       struct xfs_fsop_bulkreq bsr;
         
 
        good = random() & 1;
@@ -2339,7 +2608,7 @@ clonerange_f(
 
        /* Calculate offsets */
        len = (random() % FILELEN_MAX) + 1;
-       len &= ~(stat1.st_blksize - 1);
+       len = rounddown_64(len, stat1.st_blksize);
        if (len == 0)
                len = stat1.st_blksize;
        if (len > stat1.st_size)
@@ -2351,7 +2620,7 @@ clonerange_f(
        else
                off1 = (off64_t)(lr % MIN(stat1.st_size - len, MAXFSIZE));
        off1 %= maxfsize;
-       off1 &= ~(stat1.st_blksize - 1);
+       off1 = rounddown_64(off1, stat1.st_blksize);
 
        /*
         * If srcfile == destfile, randomly generate destination ranges
@@ -2362,7 +2631,7 @@ clonerange_f(
                lr = ((int64_t)random() << 32) + random();
                off2 = (off64_t)(lr % max_off2);
                off2 %= maxfsize;
-               off2 &= ~(stat2.st_blksize - 1);
+               off2 = rounddown_64(off2, stat2.st_blksize);
        } while (stat1.st_ino == stat2.st_ino && llabs(off2 - off1) < len);
 
        /* Clone data blocks */
@@ -2699,7 +2968,7 @@ deduperange_f(
 
        /* Never try to dedupe more than half of the src file. */
        len = (random() % FILELEN_MAX) + 1;
-       len &= ~(stat[0].st_blksize - 1);
+       len = rounddown_64(len, stat[0].st_blksize);
        if (len == 0)
                len = stat[0].st_blksize / 2;
        if (len > stat[0].st_size / 2)
@@ -2712,7 +2981,7 @@ deduperange_f(
        else
                off[0] = (off64_t)(lr % MIN(stat[0].st_size - len, MAXFSIZE));
        off[0] %= maxfsize;
-       off[0] &= ~(stat[0].st_blksize - 1);
+       off[0] = rounddown_64(off[0], stat[0].st_blksize);
 
        /*
         * If srcfile == destfile[i], randomly generate destination ranges
@@ -2728,7 +2997,7 @@ deduperange_f(
                        else
                                off[i] = (off64_t)(lr % MIN(stat[i].st_size - len, MAXFSIZE));
                        off[i] %= maxfsize;
-                       off[i] &= ~(stat[i].st_blksize - 1);
+                       off[i] = rounddown_64(off[i], stat[i].st_blksize);
                } while (stat[0].st_ino == stat[i].st_ino &&
                         llabs(off[i] - off[0]) < len &&
                         tries++ < 10);
@@ -3022,7 +3291,7 @@ creat_f(int opno, long r)
        int             v;
        int             v1;
 
-       if (!get_fname(FT_DIRm, r, NULL, NULL, &fep, &v1))
+       if (!get_fname(FT_ANYDIR, r, NULL, NULL, &fep, &v1))
                parid = -1;
        else
                parid = fep->id;
@@ -3041,7 +3310,7 @@ creat_f(int opno, long r)
        v |= v1;
        if (!e) {
                if (v) {
-                       (void)fent_to_name(&f, &flist[FT_DIR], fep);
+                       (void)fent_to_name(&f, fep);
                        printf("%d/%d: creat - no filename from %s\n",
                                procid, opno, f.path);
                }
@@ -3137,7 +3406,7 @@ dread_f(int opno, long r)
                        " fallback to stat()\n",
                                procid, opno, f.path, st, errno);
                diob.d_mem = diob.d_miniosz = stb.st_blksize;
-               diob.d_maxiosz = INT_MAX & ~(diob.d_miniosz - 1);
+               diob.d_maxiosz = rounddown_64(INT_MAX, diob.d_miniosz);
        }
 
        dio_env = getenv("XFS_DIO_MIN");
@@ -3214,7 +3483,7 @@ dwrite_f(int opno, long r)
                                " %s%s return %d, fallback to stat()\n",
                               procid, opno, f.path, st, errno);
                diob.d_mem = diob.d_miniosz = stb.st_blksize;
-               diob.d_maxiosz = INT_MAX & ~(diob.d_miniosz - 1);
+               diob.d_maxiosz = rounddown_64(INT_MAX, diob.d_miniosz);
        }
 
        dio_env = getenv("XFS_DIO_MIN");
@@ -3310,8 +3579,8 @@ do_fallocate(int opno, long r, int mode)
         */
        if ((mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)) &&
                (opno % 2)) {
-               off = ((off + stb.st_blksize - 1) & ~(stb.st_blksize - 1));
-               len = ((len + stb.st_blksize - 1) & ~(stb.st_blksize - 1));
+               off = roundup_64(off, stb.st_blksize);
+               len = roundup_64(len, stb.st_blksize);
        }
        mode |= FALLOC_FL_KEEP_SIZE & random();
        e = fallocate(fd, mode, (loff_t)off, (loff_t)len) < 0 ? errno : 0;
@@ -3586,7 +3855,7 @@ getdents_f(int opno, long r)
        int             v;
 
        init_pathname(&f);
-       if (!get_fname(FT_DIRm, r, &f, NULL, NULL, &v))
+       if (!get_fname(FT_ANYDIR, r, &f, NULL, NULL, &v))
                append_pathname(&f, ".");
        dir = opendir_path(&f);
        check_cwd();
@@ -3618,7 +3887,7 @@ getfattr_f(int opno, long r)
        int             xattr_num;
 
        init_pathname(&f);
-       if (!get_fname(FT_REGFILE | FT_DIRm, r, &f, NULL, &fep, &v)) {
+       if (!get_fname(FT_REGFILE | FT_ANYDIR, r, &f, NULL, &fep, &v)) {
                if (v)
                        printf("%d/%d: getfattr - no filename\n", procid, opno);
                goto out;
@@ -3705,7 +3974,7 @@ link_f(int opno, long r)
        v |= v1;
        if (!e) {
                if (v) {
-                       (void)fent_to_name(&l, &flist[FT_DIR], fep);
+                       (void)fent_to_name(&l, fep);
                        printf("%d/%d: link - no filename from %s\n",
                                procid, opno, l.path);
                }
@@ -3737,7 +4006,7 @@ listfattr_f(int opno, long r)
        int             buffer_len;
 
        init_pathname(&f);
-       if (!get_fname(FT_REGFILE | FT_DIRm, r, &f, NULL, &fep, &v)) {
+       if (!get_fname(FT_REGFILE | FT_ANYDIR, r, &f, NULL, &fep, &v)) {
                if (v)
                        printf("%d/%d: listfattr - no filename\n", procid, opno);
                goto out;
@@ -3787,7 +4056,7 @@ mkdir_f(int opno, long r)
        int             v;
        int             v1;
 
-       if (!get_fname(FT_DIRm, r, NULL, NULL, &fep, &v))
+       if (!get_fname(FT_ANYDIR, r, NULL, NULL, &fep, &v))
                parid = -1;
        else
                parid = fep->id;
@@ -3796,7 +4065,7 @@ mkdir_f(int opno, long r)
        v |= v1;
        if (!e) {
                if (v) {
-                       (void)fent_to_name(&f, &flist[FT_DIR], fep);
+                       (void)fent_to_name(&f, fep);
                        printf("%d/%d: mkdir - no filename from %s\n",
                                procid, opno, f.path);
                }
@@ -3825,7 +4094,7 @@ mknod_f(int opno, long r)
        int             v;
        int             v1;
 
-       if (!get_fname(FT_DIRm, r, NULL, NULL, &fep, &v))
+       if (!get_fname(FT_ANYDIR, r, NULL, NULL, &fep, &v))
                parid = -1;
        else
                parid = fep->id;
@@ -3834,7 +4103,7 @@ mknod_f(int opno, long r)
        v |= v1;
        if (!e) {
                if (v) {
-                       (void)fent_to_name(&f, &flist[FT_DIR], fep);
+                       (void)fent_to_name(&f, fep);
                        printf("%d/%d: mknod - no filename from %s\n",
                                procid, opno, f.path);
                }
@@ -3917,7 +4186,7 @@ do_mmap(int opno, long r, int prot)
 
        lr = ((int64_t)random() << 32) + random();
        off = (off64_t)(lr % stb.st_size);
-       off &= (off64_t)(~(sysconf(_SC_PAGE_SIZE) - 1));
+       off = rounddown_64(off, sysconf(_SC_PAGE_SIZE));
        len = (size_t)(random() % MIN(stb.st_size - off, FILELEN_MAX)) + 1;
 
        flags = (random() % 2) ? MAP_SHARED : MAP_PRIVATE;
@@ -4183,7 +4452,7 @@ removefattr_f(int opno, long r)
        int             xattr_num;
 
        init_pathname(&f);
-       if (!get_fname(FT_REGFILE | FT_DIRm, r, &f, NULL, &fep, &v)) {
+       if (!get_fname(FT_REGFILE | FT_ANYDIR, r, &f, NULL, &fep, &v)) {
                if (v)
                        printf("%d/%d: removefattr - no filename\n", procid, opno);
                goto out;
@@ -4215,8 +4484,18 @@ out:
        free_pathname(&f);
 }
 
+struct print_flags renameat2_flags [] = {
+       { RENAME_NOREPLACE, "NOREPLACE"},
+       { RENAME_EXCHANGE, "EXCHANGE"},
+       { RENAME_WHITEOUT, "WHITEOUT"},
+       { -1, NULL}
+};
+
+#define translate_renameat2_flags(mode)        \
+       ({translate_flags(mode, "|", renameat2_flags);})
+
 void
-rename_f(int opno, long r)
+do_renameat2(int opno, long r, int mode)
 {
        fent_t          *dfep;
        int             e;
@@ -4227,58 +4506,116 @@ rename_f(int opno, long r)
        pathname_t      newf;
        int             oldid;
        int             parid;
+       int             oldparid;
+       int             which;
        int             v;
        int             v1;
 
        /* get an existing path for the source of the rename */
        init_pathname(&f);
-       if (!get_fname(FT_ANYm, r, &f, &flp, &fep, &v1)) {
+       which = (mode == RENAME_WHITEOUT) ? FT_DEVm : FT_ANYm;
+       if (!get_fname(which, r, &f, &flp, &fep, &v1)) {
                if (v1)
-                       printf("%d/%d: rename - no filename\n", procid, opno);
+                       printf("%d/%d: rename - no source filename\n",
+                               procid, opno);
                free_pathname(&f);
                return;
        }
 
-       /* get an existing directory for the destination parent directory name */
-       if (!get_fname(FT_DIRm, random(), NULL, NULL, &dfep, &v))
-               parid = -1;
-       else
-               parid = dfep->id;
-       v |= v1;
+       /*
+        * Both pathnames must exist for the RENAME_EXCHANGE, and in
+        * order to maintain filelist/filename integrity, we should
+        * restrict exchange operation to files of the same type.
+        */
+       if (mode == RENAME_EXCHANGE) {
+               which = 1 << (flp - flist);
+               init_pathname(&newf);
+               if (!get_fname(which, random(), &newf, NULL, &dfep, &v)) {
+                       if (v)
+                               printf("%d/%d: rename - no target filename\n",
+                                       procid, opno);
+                       free_pathname(&newf);
+                       free_pathname(&f);
+                       return;
+               }
+               if (which == FT_DIRm && (fents_ancestor_check(fep, dfep) ||
+                   fents_ancestor_check(dfep, fep))) {
+                       if (v)
+                               printf("%d/%d: rename(REXCHANGE) %s and %s "
+                                       "have ancestor-descendant relationship\n",
+                                       procid, opno, f.path, newf.path);
+                       free_pathname(&newf);
+                       free_pathname(&f);
+                       return;
+               }
+               v |= v1;
+               id = dfep->id;
+               parid = dfep->parent;
+       } else {
+               /*
+                * Get an existing directory for the destination parent
+                * directory name.
+                */
+               if (!get_fname(FT_DIRm, random(), NULL, NULL, &dfep, &v))
+                       parid = -1;
+               else
+                       parid = dfep->id;
+               v |= v1;
 
-       /* generate a new path using an existing parent directory in name */
-       init_pathname(&newf);
-       e = generate_fname(dfep, flp - flist, &newf, &id, &v1);
-       v |= v1;
-       if (!e) {
-               if (v) {
-                       (void)fent_to_name(&f, &flist[FT_DIR], dfep);
-                       printf("%d/%d: rename - no filename from %s\n",
-                               procid, opno, f.path);
+               /*
+                * Generate a new path using an existing parent directory
+                * in name.
+                */
+               init_pathname(&newf);
+               e = generate_fname(dfep, flp - flist, &newf, &id, &v1);
+               v |= v1;
+               if (!e) {
+                       if (v) {
+                               (void)fent_to_name(&f, dfep);
+                               printf("%d/%d: rename - no filename from %s\n",
+                                       procid, opno, f.path);
+                       }
+                       free_pathname(&newf);
+                       free_pathname(&f);
+                       return;
                }
-               free_pathname(&newf);
-               free_pathname(&f);
-               return;
        }
-       e = rename_path(&f, &newf) < 0 ? errno : 0;
+       e = rename_path(&f, &newf, mode) < 0 ? errno : 0;
        check_cwd();
        if (e == 0) {
                int xattr_counter = fep->xattr_counter;
+               bool swap = (mode == RENAME_EXCHANGE) ? true : false;
+               int ft = flp - flist;
+
+               oldid = fep->id;
+               oldparid = fep->parent;
 
-               if (flp - flist == FT_DIR) {
-                       oldid = fep->id;
-                       fix_parent(oldid, id);
+               /*
+                * Swap the parent ids for RENAME_EXCHANGE, and replace the
+                * old parent id for the others.
+                */
+               if (ft == FT_DIR || ft == FT_SUBVOL)
+                       fix_parent(oldid, id, swap);
+
+               if (mode == RENAME_WHITEOUT) {
+                       fep->xattr_counter = 0;
+                       add_to_flist(flp - flist, id, parid, xattr_counter);
+               } else if (mode == RENAME_EXCHANGE) {
+                       fep->xattr_counter = dfep->xattr_counter;
+                       dfep->xattr_counter = xattr_counter;
+               } else {
+                       del_from_flist(flp - flist, fep - flp->fents);
+                       add_to_flist(flp - flist, id, parid, xattr_counter);
                }
-               del_from_flist(flp - flist, fep - flp->fents);
-               add_to_flist(flp - flist, id, parid, xattr_counter);
        }
        if (v) {
-               printf("%d/%d: rename %s to %s %d\n", procid, opno, f.path,
+               printf("%d/%d: rename(%s) %s to %s %d\n", procid,
+                       opno, translate_renameat2_flags(mode), f.path,
                        newf.path, e);
                if (e == 0) {
-                       printf("%d/%d: rename del entry: id=%d,parent=%d\n",
-                               procid, opno, fep->id, fep->parent);
-                       printf("%d/%d: rename add entry: id=%d,parent=%d\n",
+                       printf("%d/%d: rename source entry: id=%d,parent=%d\n",
+                               procid, opno, oldid, oldparid);
+                       printf("%d/%d: rename target entry: id=%d,parent=%d\n",
                                procid, opno, id, parid);
                }
        }
@@ -4286,6 +4623,30 @@ rename_f(int opno, long r)
        free_pathname(&f);
 }
 
+void
+rename_f(int opno, long r)
+{
+       do_renameat2(opno, r, 0);
+}
+
+void
+rnoreplace_f(int opno, long r)
+{
+       do_renameat2(opno, r, RENAME_NOREPLACE);
+}
+
+void
+rexchange_f(int opno, long r)
+{
+       do_renameat2(opno, r, RENAME_EXCHANGE);
+}
+
+void
+rwhiteout_f(int opno, long r)
+{
+       do_renameat2(opno, r, RENAME_WHITEOUT);
+}
+
 void
 resvsp_f(int opno, long r)
 {
@@ -4346,6 +4707,8 @@ rmdir_f(int opno, long r)
        int             e;
        pathname_t      f;
        fent_t          *fep;
+       int             oldid;
+       int             oldparid;
        int             v;
 
        init_pathname(&f);
@@ -4357,13 +4720,16 @@ rmdir_f(int opno, long r)
        }
        e = rmdir_path(&f) < 0 ? errno : 0;
        check_cwd();
-       if (e == 0)
+       if (e == 0) {
+               oldid = fep->id;
+               oldparid = fep->parent;
                del_from_flist(FT_DIR, fep - flist[FT_DIR].fents);
+       }
        if (v) {
                printf("%d/%d: rmdir %s %d\n", procid, opno, f.path, e);
                if (e == 0)
                        printf("%d/%d: rmdir del entry: id=%d,parent=%d\n",
-                               procid, opno, fep->id, fep->parent);
+                               procid, opno, oldid, oldparid);
        }
        free_pathname(&f);
 }
@@ -4406,7 +4772,7 @@ setfattr_f(int opno, long r)
        int             xattr_num;
 
        init_pathname(&f);
-       if (!get_fname(FT_REGFILE | FT_DIRm, r, &f, NULL, &fep, &v)) {
+       if (!get_fname(FT_REGFILE | FT_ANYDIR, r, &f, NULL, &fep, &v)) {
                if (v)
                        printf("%d/%d: setfattr - no filename\n", procid, opno);
                goto out;
@@ -4467,6 +4833,55 @@ out:
        free_pathname(&f);
 }
 
+void
+snapshot_f(int opno, long r)
+{
+#ifdef HAVE_BTRFSUTIL_H
+       enum btrfs_util_error   e;
+       pathname_t              f;
+       pathname_t              newf;
+       fent_t                  *fep;
+       int                     id;
+       int                     parid;
+       int                     v;
+       int                     v1;
+       int                     err;
+
+       init_pathname(&f);
+       if (!get_fname(FT_SUBVOLm, r, &f, NULL, &fep, &v)) {
+               if (v)
+                       printf("%d/%d: snapshot - no subvolume\n", procid,
+                              opno);
+               free_pathname(&f);
+               return;
+       }
+       init_pathname(&newf);
+       parid = fep->id;
+       err = generate_fname(fep, FT_SUBVOL, &newf, &id, &v1);
+       v |= v1;
+       if (!err) {
+               if (v) {
+                       (void)fent_to_name(&f, fep);
+                       printf("%d/%d: snapshot - no filename from %s\n",
+                              procid, opno, f.path);
+               }
+               free_pathname(&f);
+               return;
+       }
+       e = btrfs_util_create_snapshot(f.path, newf.path, 0, NULL, NULL);
+       if (e == BTRFS_UTIL_OK)
+               add_to_flist(FT_SUBVOL, id, parid, 0);
+       if (v) {
+               printf("%d/%d: snapshot %s->%s %d(%s)\n", procid, opno,
+                      f.path, newf.path, e, btrfs_util_strerror(e));
+               printf("%d/%d: snapshot add id=%d,parent=%d\n", procid, opno,
+                      id, parid);
+       }
+       free_pathname(&newf);
+       free_pathname(&f);
+#endif
+}
+
 void
 stat_f(int opno, long r)
 {
@@ -4489,6 +4904,86 @@ stat_f(int opno, long r)
        free_pathname(&f);
 }
 
+void
+subvol_create_f(int opno, long r)
+{
+#ifdef HAVE_BTRFSUTIL_H
+       enum btrfs_util_error   e;
+       pathname_t              f;
+       fent_t                  *fep;
+       int                     id;
+       int                     parid;
+       int                     v;
+       int                     v1;
+       int                     err;
+
+       init_pathname(&f);
+       if (!get_fname(FT_ANYDIR, r, NULL, NULL, &fep, &v))
+               parid = -1;
+       else
+               parid = fep->id;
+       err = generate_fname(fep, FT_SUBVOL, &f, &id, &v1);
+       v |= v1;
+       if (!err) {
+               if (v) {
+                       (void)fent_to_name(&f, fep);
+                       printf("%d/%d: subvol_create - no filename from %s\n",
+                              procid, opno, f.path);
+               }
+               free_pathname(&f);
+               return;
+       }
+       e = btrfs_util_create_subvolume(f.path, 0, NULL, NULL);
+       if (e == BTRFS_UTIL_OK)
+               add_to_flist(FT_SUBVOL, id, parid, 0);
+       if (v) {
+               printf("%d/%d: subvol_create %s %d(%s)\n", procid, opno,
+                      f.path, e, btrfs_util_strerror(e));
+               printf("%d/%d: subvol_create add id=%d,parent=%d\n", procid,
+                      opno, id, parid);
+       }
+       free_pathname(&f);
+#endif
+}
+
+void
+subvol_delete_f(int opno, long r)
+{
+#ifdef HAVE_BTRFSUTIL_H
+       enum btrfs_util_error   e;
+       pathname_t              f;
+       fent_t                  *fep;
+       int                     v;
+       int                     oldid;
+       int                     oldparid;
+
+       init_pathname(&f);
+       if (!get_fname(FT_SUBVOLm, r, &f, NULL, &fep, &v)) {
+               if (v)
+                       printf("%d:%d: subvol_delete - no subvolume\n", procid,
+                              opno);
+               free_pathname(&f);
+               return;
+       }
+       e = btrfs_util_delete_subvolume(f.path, 0);
+       check_cwd();
+       if (e == BTRFS_UTIL_OK) {
+               oldid = fep->id;
+               oldparid = fep->parent;
+               delete_subvol_children(oldid);
+               del_from_flist(FT_SUBVOL, fep - flist[FT_SUBVOL].fents);
+       }
+       if (v) {
+               printf("%d/%d: subvol_delete %s %d(%s)\n", procid, opno, f.path,
+                      e, btrfs_util_strerror(e));
+               if (e == BTRFS_UTIL_OK)
+                       printf("%d/%d: subvol_delete del entry: id=%d,parent=%d\n",
+                              procid, opno, oldid, oldparid);
+       }
+       free_pathname(&f);
+#endif
+}
+
 void
 symlink_f(int opno, long r)
 {
@@ -4503,7 +4998,7 @@ symlink_f(int opno, long r)
        int             v1;
        char            *val;
 
-       if (!get_fname(FT_DIRm, r, NULL, NULL, &fep, &v))
+       if (!get_fname(FT_ANYDIR, r, NULL, NULL, &fep, &v))
                parid = -1;
        else
                parid = fep->id;
@@ -4512,7 +5007,7 @@ symlink_f(int opno, long r)
        v |= v1;
        if (!e) {
                if (v) {
-                       (void)fent_to_name(&f, &flist[FT_DIR], fep);
+                       (void)fent_to_name(&f, fep);
                        printf("%d/%d: symlink - no filename from %s\n",
                                procid, opno, f.path);
                }
@@ -4593,6 +5088,8 @@ unlink_f(int opno, long r)
        pathname_t      f;
        fent_t          *fep;
        flist_t         *flp;
+       int             oldid;
+       int             oldparid;
        int             v;
 
        init_pathname(&f);
@@ -4604,13 +5101,16 @@ unlink_f(int opno, long r)
        }
        e = unlink_path(&f) < 0 ? errno : 0;
        check_cwd();
-       if (e == 0)
+       if (e == 0) {
+               oldid = fep->id;
+               oldparid = fep->parent;
                del_from_flist(flp - flist, fep - flp->fents);
+       }
        if (v) {
                printf("%d/%d: unlink %s %d\n", procid, opno, f.path, e);
                if (e == 0)
                        printf("%d/%d: unlink del entry: id=%d,parent=%d\n",
-                               procid, opno, fep->id, fep->parent);
+                               procid, opno, oldid, oldparid);
        }
        free_pathname(&f);
 }
@@ -4669,6 +5169,22 @@ unresvsp_f(int opno, long r)
        close(fd);
 }
 
+void
+uring_read_f(int opno, long r)
+{
+#ifdef URING
+       do_uring_rw(opno, r, O_RDONLY);
+#endif
+}
+
+void
+uring_write_f(int opno, long r)
+{
+#ifdef URING
+       do_uring_rw(opno, r, O_WRONLY);
+#endif
+}
+
 void
 write_f(int opno, long r)
 {