ubifs: use prandom_bytes

This also converts filling memory loop to use memset.

Signed-off-by: Akinobu Mita <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: "Theodore Ts'o" <[email protected]>
Cc: David Laight <[email protected]>
Cc: David Woodhouse <[email protected]>
Cc: Eilon Greenstein <[email protected]>
Cc: Michel Lespinasse <[email protected]>
Cc: Robert Love <[email protected]>
Cc: Valdis Kletnieks <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 62911637e12f3123742ad0e96cc1cc0829f7f2e3..12817ffc7345b6fcb70726b087a888961678b2f4 100644 (file)
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -2560,7 +2560,7 @@ static int power_cut_emulated(struct ubifs_info *c, int lnum, int write)
 static int corrupt_data(const struct ubifs_info *c, const void *buf,
                        unsigned int len)
 {
-       unsigned int from, to, i, ffs = chance(1, 2);
+       unsigned int from, to, ffs = chance(1, 2);
        unsigned char *p = (void *)buf;
 
        from = random32() % (len + 1);
@@ -2571,11 +2571,9 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf,
                   ffs ? "0xFFs" : "random data");
 
        if (ffs)
-               for (i = from; i < to; i++)
-                       p[i] = 0xFF;
+               memset(p + from, 0xFF, to - from);
        else
-               for (i = from; i < to; i++)
-                       p[i] = random32() % 0x100;
+               prandom_bytes(p + from, to - from);
 
        return to;
 }