Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'upstream-4.14-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI updates from Richard Weinberger:
"Minor improvements"
* tag 'upstream-4.14-rc1' of git://git.infradead.org/linux-ubifs:
UBI: Fix two typos in comments
ubi: fastmap: fix spelling mistake: "invalidiate" -> "invalidate"
ubi: pr_err() strings should end with newlines
ubi: pr_err() strings should end with newlines
ubi: pr_err() strings should end with newlines
+16
-16
+3
-3
drivers/mtd/ubi/block.c
+3
-3
drivers/mtd/ubi/block.c
···
383
383
/* Initialize the gendisk of this ubiblock device */
384
384
gd = alloc_disk(1);
385
385
if (!gd) {
386
-
pr_err("UBI: block: alloc_disk failed");
386
+
pr_err("UBI: block: alloc_disk failed\n");
387
387
ret = -ENODEV;
388
388
goto out_free_dev;
389
389
}
···
607
607
desc = open_volume_desc(p->name, p->ubi_num, p->vol_id);
608
608
if (IS_ERR(desc)) {
609
609
pr_err(
610
-
"UBI: block: can't open volume on ubi%d_%d, err=%ld",
610
+
"UBI: block: can't open volume on ubi%d_%d, err=%ld\n",
611
611
p->ubi_num, p->vol_id, PTR_ERR(desc));
612
612
continue;
613
613
}
···
618
618
ret = ubiblock_create(&vi);
619
619
if (ret) {
620
620
pr_err(
621
-
"UBI: block: can't add '%s' volume on ubi%d_%d, err=%d",
621
+
"UBI: block: can't add '%s' volume on ubi%d_%d, err=%d\n",
622
622
vi.name, p->ubi_num, p->vol_id, ret);
623
623
continue;
624
624
}
+10
-10
drivers/mtd/ubi/build.c
+10
-10
drivers/mtd/ubi/build.c
···
825
825
for (i = 0; i < UBI_MAX_DEVICES; i++) {
826
826
ubi = ubi_devices[i];
827
827
if (ubi && mtd->index == ubi->mtd->index) {
828
-
pr_err("ubi: mtd%d is already attached to ubi%d",
828
+
pr_err("ubi: mtd%d is already attached to ubi%d\n",
829
829
mtd->index, i);
830
830
return -EEXIST;
831
831
}
···
840
840
* no sense to attach emulated MTD devices, so we prohibit this.
841
841
*/
842
842
if (mtd->type == MTD_UBIVOLUME) {
843
-
pr_err("ubi: refuse attaching mtd%d - it is already emulated on top of UBI",
843
+
pr_err("ubi: refuse attaching mtd%d - it is already emulated on top of UBI\n",
844
844
mtd->index);
845
845
return -EINVAL;
846
846
}
···
851
851
if (!ubi_devices[ubi_num])
852
852
break;
853
853
if (ubi_num == UBI_MAX_DEVICES) {
854
-
pr_err("ubi: only %d UBI devices may be created",
854
+
pr_err("ubi: only %d UBI devices may be created\n",
855
855
UBI_MAX_DEVICES);
856
856
return -ENFILE;
857
857
}
···
861
861
862
862
/* Make sure ubi_num is not busy */
863
863
if (ubi_devices[ubi_num]) {
864
-
pr_err("ubi: ubi%i already exists", ubi_num);
864
+
pr_err("ubi: ubi%i already exists\n", ubi_num);
865
865
return -EEXIST;
866
866
}
867
867
}
···
1166
1166
BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);
1167
1167
1168
1168
if (mtd_devs > UBI_MAX_DEVICES) {
1169
-
pr_err("UBI error: too many MTD devices, maximum is %d",
1169
+
pr_err("UBI error: too many MTD devices, maximum is %d\n",
1170
1170
UBI_MAX_DEVICES);
1171
1171
return -EINVAL;
1172
1172
}
···
1178
1178
1179
1179
err = misc_register(&ubi_ctrl_cdev);
1180
1180
if (err) {
1181
-
pr_err("UBI error: cannot register device");
1181
+
pr_err("UBI error: cannot register device\n");
1182
1182
goto out;
1183
1183
}
1184
1184
···
1205
1205
mtd = open_mtd_device(p->name);
1206
1206
if (IS_ERR(mtd)) {
1207
1207
err = PTR_ERR(mtd);
1208
-
pr_err("UBI error: cannot open mtd %s, error %d",
1208
+
pr_err("UBI error: cannot open mtd %s, error %d\n",
1209
1209
p->name, err);
1210
1210
/* See comment below re-ubi_is_module(). */
1211
1211
if (ubi_is_module())
···
1218
1218
p->vid_hdr_offs, p->max_beb_per1024);
1219
1219
mutex_unlock(&ubi_devices_mutex);
1220
1220
if (err < 0) {
1221
-
pr_err("UBI error: cannot attach mtd%d",
1221
+
pr_err("UBI error: cannot attach mtd%d\n",
1222
1222
mtd->index);
1223
1223
put_mtd_device(mtd);
1224
1224
···
1242
1242
1243
1243
err = ubiblock_init();
1244
1244
if (err) {
1245
-
pr_err("UBI error: block: cannot initialize, error %d", err);
1245
+
pr_err("UBI error: block: cannot initialize, error %d\n", err);
1246
1246
1247
1247
/* See comment above re-ubi_is_module(). */
1248
1248
if (ubi_is_module())
···
1265
1265
misc_deregister(&ubi_ctrl_cdev);
1266
1266
out:
1267
1267
class_unregister(&ubi_class);
1268
-
pr_err("UBI error: cannot initialize UBI, error %d", err);
1268
+
pr_err("UBI error: cannot initialize UBI, error %d\n", err);
1269
1269
return err;
1270
1270
}
1271
1271
late_initcall(ubi_init);
+1
-1
drivers/mtd/ubi/fastmap.c
+1
-1
drivers/mtd/ubi/fastmap.c
+2
-2
drivers/mtd/ubi/ubi-media.h
+2
-2
drivers/mtd/ubi/ubi-media.h
···
229
229
* copy. UBI also calculates data CRC when the data is moved and stores it at
230
230
* the @data_crc field of the copy (P1). So when UBI needs to pick one physical
231
231
* eraseblock of two (P or P1), the @copy_flag of the newer one (P1) is
232
-
* examined. If it is cleared, the situation* is simple and the newer one is
232
+
* examined. If it is cleared, the situation is simple and the newer one is
233
233
* picked. If it is set, the data CRC of the copy (P1) is examined. If the CRC
234
234
* checksum is correct, this physical eraseblock is selected (P1). Otherwise
235
235
* the older one (P) is selected.
···
389
389
#define UBI_FM_POOL_MAGIC 0x67AF4D08
390
390
#define UBI_FM_EBA_MAGIC 0xf0c040a8
391
391
392
-
/* A fastmap supber block can be located between PEB 0 and
392
+
/* A fastmap super block can be located between PEB 0 and
393
393
* UBI_FM_MAX_START */
394
394
#define UBI_FM_MAX_START 64
395
395