diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 09:32:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 09:32:33 -0800 |
| commit | 4b48d9d44ebe0e8c31b4fe3b7480941576fff613 (patch) | |
| tree | 457e0f1214ba44742f63e3cfc472ffbec206d0f3 /fs/btrfs/super.c | |
| parent | b762666cc7c9f83ac5759127c29dfad438c09e48 (diff) | |
| parent | c071fcfdb60e7abbe95e02460005d6bca165bf24 (diff) | |
| download | linux-stable-4b48d9d44ebe0e8c31b4fe3b7480941576fff613.tar.gz linux-stable-4b48d9d44ebe0e8c31b4fe3b7480941576fff613.tar.bz2 linux-stable-4b48d9d44ebe0e8c31b4fe3b7480941576fff613.zip | |
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
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 7256cf242eb0..db9fb3bc1e33 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -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, |