diff options
| author |   Chris Mason <clm@fb.com> | 2015-10-21 18:21:40 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-21 18:21:40 -0700 |
| commit | a0d58e48db58801a0e764e9b9c87e1782d390fcb (patch) | |
| tree | f413f86da859552a29df58f40d450372977b5673 /fs/btrfs/ioctl.c | |
| parent | Merge branch 'fix/waitqueue-barriers' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4 (diff) | |
| parent | btrfs: reada: Fix returned errno code (diff) | |
| download | linux-dev-a0d58e48db58801a0e764e9b9c87e1782d390fcb.tar.xz linux-dev-a0d58e48db58801a0e764e9b9c87e1782d390fcb.zip | |
Merge branch 'cleanups/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 80342d3fa5d2..a30d32b901da 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2699,7 +2699,6 @@ static long btrfs_ioctl_fs_info(struct btrfs_root *root, void __user *arg) { struct btrfs_ioctl_fs_info_args *fi_args; struct btrfs_device *device; - struct btrfs_device *next; struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices; int ret = 0; @@ -2711,7 +2710,7 @@ static long btrfs_ioctl_fs_info(struct btrfs_root *root, void __user *arg) fi_args->num_devices = fs_devices->num_devices; memcpy(&fi_args->fsid, root->fs_info->fsid, sizeof(fi_args->fsid)); - list_for_each_entry_safe(device, next, &fs_devices->devices, dev_list) { + list_for_each_entry(device, &fs_devices->devices, dev_list) { if (device->devid > fi_args->max_id) fi_args->max_id = device->devid; } |