]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ubifs: use prandom_bytes
authorAkinobu Mita <akinobu.mita@gmail.com>
Tue, 18 Dec 2012 00:04:35 +0000 (16:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 01:15:26 +0000 (17:15 -0800)
This also converts filling memory loop to use memset.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: David Laight <david.laight@aculab.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Eilon Greenstein <eilong@broadcom.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Robert Love <robert.w.love@intel.com>
Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ubifs/debug.c

index 62911637e12f3123742ad0e96cc1cc0829f7f2e3..12817ffc7345b6fcb70726b087a888961678b2f4 100644 (file)
@@ -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)
 {
 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);
        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)
                   ffs ? "0xFFs" : "random data");
 
        if (ffs)
-               for (i = from; i < to; i++)
-                       p[i] = 0xFF;
+               memset(p + from, 0xFF, to - from);
        else
        else
-               for (i = from; i < to; i++)
-                       p[i] = random32() % 0x100;
+               prandom_bytes(p + from, to - from);
 
        return to;
 }
 
        return to;
 }