diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 12:32:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 12:32:33 -0500 |
| commit | 4b48d9d44ebe0e8c31b4fe3b7480941576fff613 (patch) | |
| tree | 457e0f1214ba44742f63e3cfc472ffbec206d0f3 /fs/btrfs/volumes.c | |
| parent | b762666cc7c9f83ac5759127c29dfad438c09e48 (diff) | |
| parent | c071fcfdb60e7abbe95e02460005d6bca165bf24 (diff) | |
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/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b187b537888e..3451e1cca2b5 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
| @@ -220,6 +220,7 @@ loop: | |||
| 220 | tail->bi_next = old_head; | 220 | tail->bi_next = old_head; |
| 221 | else | 221 | else |
| 222 | device->pending_bio_tail = tail; | 222 | device->pending_bio_tail = tail; |
| 223 | device->running_pending = 0; | ||
| 223 | 224 | ||
| 224 | spin_unlock(&device->io_lock); | 225 | spin_unlock(&device->io_lock); |
| 225 | btrfs_requeue_work(&device->work); | 226 | btrfs_requeue_work(&device->work); |