diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-02 03:13:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-02 03:13:54 +0300 |
| commit | 71e41bbb43794e0fe4ce3b766d713e222ccfb5ea (patch) | |
| tree | 440f95dec8ac8fab4d817d76fe2714bbf1dedfe5 /fs/ext4/resize.c | |
| parent | a057c3259ab6ecab477379d23e27ea0afdb219e6 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| download | linux-71e41bbb43794e0fe4ce3b766d713e222ccfb5ea.tar.xz | |
Merge 4.5-rc6 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4/resize.c')
| -rw-r--r-- | fs/ext4/resize.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index ad62d7acc315..34038e3598d5 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -198,7 +198,7 @@ static struct ext4_new_flex_group_data *alloc_flex_gd(unsigned long flexbg_size) if (flex_gd == NULL) goto out3; - if (flexbg_size >= UINT_MAX / sizeof(struct ext4_new_flex_group_data)) + if (flexbg_size >= UINT_MAX / sizeof(struct ext4_new_group_data)) goto out2; flex_gd->count = flexbg_size; |