git: b49b6e0f95c8 - main - swapon(8): adapt to the new swapoff(2) interface

[Konstantin Belousov]

The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b49b6e0f95c89f8dcb5898424c360b46019254b4

commit b49b6e0f95c89f8dcb5898424c360b46019254b4
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-12-08 21:05:49 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-12-09 00:48:59 +0000

    swapon(8): adapt to the new swapoff(2) interface
    
    also fix test sys/audit/administrative.c.
    
    Reviewed by:    brooks
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D33343
---
 sbin/swapon/swapon.c             | 10 ++--------
 tests/sys/audit/administrative.c |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index d644d99e7913..4daa6e8b17ee 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -789,18 +789,12 @@ swapon_trim(const char *name)
 static const char *
 swap_on_off_sfile(const char *name, int doingall)
 {
-       struct swapoff_new_args sa;
        int error;
 
        if (which_prog == SWAPON)
                error = Eflag ? swapon_trim(name) : swapon(name);
-       else { /* SWAPOFF */
-               bzero(&sa, sizeof(sa));
-               sa.name = name;
-               if (fflag)
-                       sa.flags |= SWAPOFF_FORCE;
-               error = swapoff((const char *)&sa);
-       }
+       else /* SWAPOFF */
+               error = swapoff(name, fflag ? SWAPOFF_FORCE : 0);
 
        if (error == -1) {
                switch (errno) {
diff --git a/tests/sys/audit/administrative.c b/tests/sys/audit/administrative.c
index d75f6147cdf4..159e7c14e031 100644
--- a/tests/sys/audit/administrative.c
+++ b/tests/sys/audit/administrative.c
@@ -1605,7 +1605,7 @@ ATF_TC_BODY(swapoff_failure, tc)
 
        FILE *pipefd = setup(fds, auclass);
        /* Failure reason: Block device required */
-       ATF_REQUIRE_EQ(-1, swapoff(path));
+       ATF_REQUIRE_EQ(-1, swapoff(path, 0));
        check_audit(fds, adregex, pipefd);
 }