chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of some more unused defines and dirs
[elogind.git]
/
src
/
shared
/
btrfs-util.c
diff --git
a/src/shared/btrfs-util.c
b/src/shared/btrfs-util.c
index 3ed14dc0f70a82d4187c5ceea7b4ab135262ae38..49528dbf0152e119d6ee1d9f3ed7acaa0f067b41 100644
(file)
--- a/
src/shared/btrfs-util.c
+++ b/
src/shared/btrfs-util.c
@@
-803,6
+803,7
@@
static int subvol_remove_children(int fd, const char *subvolume, uint64_t subvol
struct btrfs_ioctl_vol_args vol_args = {};
_cleanup_close_ int subvol_fd = -1;
struct stat st;
struct btrfs_ioctl_vol_args vol_args = {};
_cleanup_close_ int subvol_fd = -1;
struct stat st;
+ bool made_writable = false;
int r;
assert(fd >= 0);
int r;
assert(fd >= 0);
@@
-872,6
+873,14
@@
static int subvol_remove_children(int fd, const char *subvolume, uint64_t subvol
if (ioctl(fd, BTRFS_IOC_INO_LOOKUP, &ino_args) < 0)
return -errno;
if (ioctl(fd, BTRFS_IOC_INO_LOOKUP, &ino_args) < 0)
return -errno;
+ if (!made_writable) {
+ r = btrfs_subvol_set_read_only_fd(subvol_fd, false);
+ if (r < 0)
+ return r;
+
+ made_writable = true;
+ }
+
if (isempty(ino_args.name))
/* Subvolume is in the top-level
* directory of the subvolume. */
if (isempty(ino_args.name))
/* Subvolume is in the top-level
* directory of the subvolume. */