diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /fs/nfs/flexfilelayout/flexfilelayout.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'fs/nfs/flexfilelayout/flexfilelayout.c')
| -rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index c12951b9551e..b3289d701eea 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c | |||
| @@ -1852,7 +1852,7 @@ ff_layout_mirror_prepare_stats(struct nfs42_layoutstat_args *args, | |||
| 1852 | struct nfs42_layoutstat_devinfo *devinfo; | 1852 | struct nfs42_layoutstat_devinfo *devinfo; |
| 1853 | int i; | 1853 | int i; |
| 1854 | 1854 | ||
| 1855 | for (i = 0; i <= FF_LAYOUT_MIRROR_COUNT(pls); i++) { | 1855 | for (i = 0; i < FF_LAYOUT_MIRROR_COUNT(pls); i++) { |
| 1856 | if (*dev_count >= dev_limit) | 1856 | if (*dev_count >= dev_limit) |
| 1857 | break; | 1857 | break; |
| 1858 | mirror = FF_LAYOUT_COMP(pls, i); | 1858 | mirror = FF_LAYOUT_COMP(pls, i); |