X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-btrfs.c;h=43b445d8312a3e7249cffeae3b9af8c84535040a;hp=4a08c72fbb5c9ed5b69459f7f1b7d62d77834ff9;hb=c75f27ea2b483f91d437ebaf8494457dc76f3fd6;hpb=86e339c8846cdf614a41653384c0b4e84b233696

diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c
index 4a08c72fb..43b445d83 100644
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -29,26 +29,30 @@
 
 int main(int argc, char *argv[]) {
         int r;
-        BtrfsSubvolInfo info;
-        char ts[FORMAT_TIMESTAMP_MAX];
         int fd;
 
         fd = open("/", O_RDONLY|O_CLOEXEC|O_DIRECTORY);
         if (fd < 0)
                 log_error_errno(errno, "Failed to open root directory: %m");
         else {
+                BtrfsSubvolInfo info;
+                char ts[FORMAT_TIMESTAMP_MAX];
+
                 r = btrfs_subvol_get_info_fd(fd, &info);
                 if (r < 0)
                         log_error_errno(r, "Failed to get subvolume info: %m");
                 else {
                         log_info("otime: %s", format_timestamp(ts, sizeof(ts), info.otime));
-                        log_info("read-only: %s", yes_no(info.read_only));
+                        log_info("read-only (search): %s", yes_no(info.read_only));
                 }
 
                 r = btrfs_subvol_get_read_only_fd(fd);
-                assert_se(r >= 0);
+                if (r < 0)
+                        log_error_errno(r, "Failed to get read only flag: %m");
+                else
+                        log_info("read-only (ioctl): %s", yes_no(r));
 
-                log_info("read-only: %s", yes_no(r));
+                safe_close(fd);
         }
 
         r = btrfs_subvol_make("/xxxtest");