diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2016-08-09 04:08:06 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-08-25 12:58:20 +0200 |
| commit | d06f23d6a947c9abae41dc46be69a56baf36f436 (patch) | |
| tree | e00a2fd29247e7aa09267eb7150e9774c0d95fa8 /fs/btrfs/ioctl.c | |
| parent | btrfs: properly track when rescan worker is running (diff) | |
| download | linux-d06f23d6a947c9abae41dc46be69a56baf36f436.tar.xz linux-d06f23d6a947c9abae41dc46be69a56baf36f436.zip | |
btrfs: waiting on qgroup rescan should not always be interruptible
We wait on qgroup rescan completion in three places: file system
shutdown, the quota disable ioctl, and the rescan wait ioctl. If the
user sends a signal while we're waiting, we continue happily along. This
is expected behavior for the rescan wait ioctl. It's racy in the shutdown
path but mostly works due to other unrelated synchronization points.
In the quota disable path, it Oopses the kernel pretty much immediately.
Cc: <stable@vger.kernel.org> # v4.4+
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 14ed1e9e6bc8..b2a2da5893af 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -5084,7 +5084,7 @@ static long btrfs_ioctl_quota_rescan_wait(struct file *file, void __user *arg) if (!capable(CAP_SYS_ADMIN)) return -EPERM; - return btrfs_qgroup_wait_for_completion(root->fs_info); + return btrfs_qgroup_wait_for_completion(root->fs_info, true); } static long _btrfs_ioctl_set_received_subvol(struct file *file, |