Commit 4b48d9d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable 

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix ioctl arg size (userland incompatible change!)
  Btrfs: Clear the device->running_pending flag before bailing on congestion
parents b762666c c071fcfd

fs/btrfs/ioctl.h

+8 −6
Original line number Diff line number Diff line
@@ -22,13 +22,20 @@ 


#define BTRFS_IOCTL_MAGIC 0x94

#define BTRFS_VOL_NAME_MAX 255

#define BTRFS_PATH_NAME_MAX 3072

#define BTRFS_PATH_NAME_MAX 4087



/* this should be 4k */

struct btrfs_ioctl_vol_args {

	__s64 fd;

	char name[BTRFS_PATH_NAME_MAX + 1];

};



struct btrfs_ioctl_clone_range_args {

  __s64 src_fd;

  __u64 src_offset, src_length;

  __u64 dest_offset;

};



#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \

				   struct btrfs_ioctl_vol_args)

#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
@@ -52,11 +59,6 @@ struct btrfs_ioctl_vol_args { 
				   struct btrfs_ioctl_vol_args)

#define BTRFS_IOC_BALANCE _IOW(BTRFS_IOCTL_MAGIC, 12, \

				   struct btrfs_ioctl_vol_args)

struct btrfs_ioctl_clone_range_args {

  __s64 src_fd;

  __u64 src_offset, src_length;

  __u64 dest_offset;

};



#define BTRFS_IOC_CLONE_RANGE _IOW(BTRFS_IOCTL_MAGIC, 13, \

				  struct btrfs_ioctl_clone_range_args)

fs/btrfs/super.c

+2 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, 
{

	struct btrfs_ioctl_vol_args *vol;

	struct btrfs_fs_devices *fs_devices;

	int ret = 0;

	int ret = -ENOTTY;

	int len;



	if (!capable(CAP_SYS_ADMIN))
@@ -594,6 +594,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, 
		goto out;

	}

	len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);



	switch (cmd) {

	case BTRFS_IOC_SCAN_DEV:

		ret = btrfs_scan_one_device(vol->name, FMODE_READ,

fs/btrfs/volumes.c

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ static noinline int run_scheduled_bios(struct btrfs_device *device) 
				tail->bi_next = old_head;

			else

				device->pending_bio_tail = tail;

			device->running_pending = 0;



			spin_unlock(&device->io_lock);

			btrfs_requeue_work(&device->work);