Merge tag 'nfs-for-3.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / block / partitions / check.c

diff --git a/block/partitions/check.c b/block/partitions/check.c
index 9ac1df74f69940c068333537e082299955a4a90b..16118d11dbfc002cdc11463c3ee4024685615420 100644 (file)
--- a/block/partitions/check.c
+++ b/block/partitions/check.c
@@ -184,12 +184,12 @@ check_partition(struct gendisk *hd, struct block_device *bdev)
        if (err)
        /* The partition is unrecognized. So report I/O errors if there were any */
                res = err;
-       if (!res)
-               strlcat(state->pp_buf, " unknown partition table\n", PAGE_SIZE);
-       else if (warn_no_part)
-               strlcat(state->pp_buf, " unable to read partition table\n", PAGE_SIZE);
-
-       printk(KERN_INFO "%s", state->pp_buf);
+       if (res) {
+               if (warn_no_part)
+                       strlcat(state->pp_buf,
+                               " unable to read partition table\n", PAGE_SIZE);
+               printk(KERN_INFO "%s", state->pp_buf);
+       }
 
        free_page((unsigned long)state->pp_buf);
        free_partitions(state);