Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux...

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_alloc.c

diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
index c1cf6a336a72fb178602ad10908825caeecc20b7..d43813267a80dc06e91a0015d07e6277e1bb9624 100644 (file)
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
@@ -257,16 +257,14 @@ xfs_alloc_fix_len(
        k = rlen % args->prod;
        if (k == args->mod)
                return;
-       if (k > args->mod) {
-               if ((int)(rlen = rlen - k - args->mod) < (int)args->minlen)
-                       return;
-       } else {
-               if ((int)(rlen = rlen - args->prod - (args->mod - k)) <
-                   (int)args->minlen)
-                       return;
-       }
-       ASSERT(rlen >= args->minlen);
-       ASSERT(rlen <= args->maxlen);
+       if (k > args->mod)
+               rlen = rlen - (k - args->mod);
+       else
+               rlen = rlen - args->prod + (args->mod - k);
+       if ((int)rlen < (int)args->minlen)
+               return;
+       ASSERT(rlen >= args->minlen && rlen <= args->maxlen);
+       ASSERT(rlen % args->prod == args->mod);
        args->len = rlen;
 }
 
@@ -541,7 +539,6 @@ xfs_alloc_read_agfl(
                        XFS_FSS_TO_BB(mp, 1), 0, &bp, &xfs_agfl_buf_ops);
        if (error)
                return error;
-       ASSERT(!xfs_buf_geterror(bp));
        xfs_buf_set_ref(bp, XFS_AGFL_REF);
        *bpp = bp;
        return 0;