marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: btrfsck operations should be exclusive 

this patch will make btrfsck operations to open disk in exclusive mode,
so that mount will fail when btrfsck is running

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
master
Anand Jain 2014-01-13 21:14:55 +08:00 committed by Chris Mason
parent b2e99e1819
commit f920dbce8d
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmds-check.c
View File

@ -6390,7 +6390,8 @@ int cmd_check(int argc, char **argv)
int option_index = 0;
int init_csum_tree = 0;
int init_extent_tree = 0;
enum btrfs_open_ctree_flags ctree_flags = OPEN_CTREE_PARTIAL;
enum btrfs_open_ctree_flags ctree_flags =
OPEN_CTREE_PARTIAL | OPEN_CTREE_EXCLUSIVE;
while(1) {
int c;

10
disk-io.c
View File

@ -1057,6 +1057,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
struct btrfs_fs_devices *fs_devices = NULL;
struct extent_buffer *eb;
int ret;
int oflags;
if (sb_bytenr == 0)
sb_bytenr = BTRFS_SUPER_INFO_OFFSET;
@ -1080,9 +1081,14 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
fs_info->fs_devices = fs_devices;
if (flags & OPEN_CTREE_WRITES)
ret = btrfs_open_devices(fs_devices, O_RDWR);
oflags = O_RDWR;
else
ret = btrfs_open_devices(fs_devices, O_RDONLY);
oflags = O_RDONLY;
if (flags & OPEN_CTREE_EXCLUSIVE)
oflags |= O_EXCL;
ret = btrfs_open_devices(fs_devices, oflags);
if (ret)
goto out_devices;

1
disk-io.h
View File

@ -32,6 +32,7 @@ enum btrfs_open_ctree_flags {
OPEN_CTREE_RECOVER_SUPER = 8,
OPEN_CTREE_RESTORE = 16,
OPEN_CTREE_NO_BLOCK_GROUPS = 32,
OPEN_CTREE_EXCLUSIVE = 64,
};
static inline u64 btrfs_sb_offset(int mirror)

2
volumes.c
View File

@ -214,7 +214,7 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, int flags)
if (device->devid == fs_devices->lowest_devid)
fs_devices->lowest_bdev = fd;
device->fd = fd;
if (flags == O_RDWR)
if (flags & O_RDWR)
device->writeable = 1;
}
return 0;