summaryrefslogtreecommitdiff
path: root/btrfs-convert.c
diff options
context:
space:
mode:
authorQu Wenruo <quwenruo@cn.fujitsu.com>2016-08-19 16:13:05 +0800
committerDavid Sterba <dsterba@suse.com>2016-08-19 13:52:43 +0200
commitbdadea75e47f21682b745678c9b685e491c5e8a3 (patch)
tree8bd80719e08007a1e44793ea1968392944194b5e /btrfs-convert.c
parent55aa862ea21c733cbc0444955006856321e9e957 (diff)
btrfs-progs: convert: Fix a regression that ext2_save/image is not readonly
The new convert treats the convert image as a normal file, without any special flags and permissions. This is different from original code: 1) Permission changed from 0400 to 0600 2) Inode lacks READONLY flag This makes we can read-write mount the ext2 image and cause rollback failure. Follow old code behavior, use 0400 permission and add back READONLY flag to fix it. Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'btrfs-convert.c')
-rw-r--r--btrfs-convert.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c
index b18de59d..a8852d61 100644
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -1527,8 +1527,12 @@ static int create_image(struct btrfs_root *root,
struct cache_tree used_tmp;
u64 cur;
u64 ino;
+ u64 flags = BTRFS_INODE_READONLY;
int ret;
+ if (!datacsum)
+ flags |= BTRFS_INODE_NODATASUM;
+
trans = btrfs_start_transaction(root, 1);
if (!trans)
return -ENOMEM;
@@ -1539,7 +1543,10 @@ static int create_image(struct btrfs_root *root,
&ino);
if (ret < 0)
goto out;
- ret = btrfs_new_inode(trans, root, ino, 0600 | S_IFREG);
+ ret = btrfs_new_inode(trans, root, ino, 0400 | S_IFREG);
+ if (ret < 0)
+ goto out;
+ ret = btrfs_change_inode_flags(trans, root, ino, flags);
if (ret < 0)
goto out;
ret = btrfs_add_link(trans, root, ino, BTRFS_FIRST_FREE_OBJECTID, name,