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

Fix ioctl arg size (userland incompatible change!) 

The structure used to send device in btrfs ioctl calls was not
properly aligned, and so 32 bit ioctls would not work properly on
64 bit kernels.

We could fix this with compat ioctls, but we're just one byte away
and it doesn't make sense at this stage to carry about the compat ioctls
forever at this stage in the project.

This patch brings the ioctl arg up to an evenly aligned 4k.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
master
Chris Mason 2009-01-16 12:05:01 -05:00
parent 6fc10e9fe3
commit f9f3fff9a4
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ioctl.h
View File

@ -23,7 +23,7 @@
#define BTRFS_IOCTL_MAGIC 0x94
#define BTRFS_VOL_NAME_MAX 255
#define BTRFS_PATH_NAME_MAX 3072
#define BTRFS_PATH_NAME_MAX 4087
struct btrfs_ioctl_vol_args {
__s64 fd;

11
utils.c
View File

@ -653,18 +653,13 @@ void btrfs_register_one_device(char *fname)
fd = open("/dev/btrfs-control", O_RDONLY);
if (fd < 0) {
fprintf(stderr, "failed to open"
"/dev/btrfs-control\n");
exit(1);
fprintf(stderr, "failed to open /dev/btrfs-control "
"skipping device registration\n");
return;
}
strcpy(args.name, fname);
ret = ioctl(fd, BTRFS_IOC_SCAN_DEV, &args);
close(fd);
if (ret < 0) {
fprintf(stderr, "failed to register device %s\n",
fname);
exit(1);
}
}
int btrfs_scan_one_dir(char *dirname, int run_ioctl)