Skip to contentSkip to conversation

devlink: correct misspelling of snapshot

PATCH Applied Jacob Keller 4 participants 10 messages Jan 9, 2020 – Jan 11, 2020

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 devlink: correct misspelling of snapshot

The function to obtain a unique snapshot id was mistakenly typo'd as devlink_region_shapshot_id_get. Fix this typo by renaming the function and all of its users.

---
 drivers/net/ethernet/mellanox/mlx4/crdump.c | 2 +-
 drivers/net/netdevsim/dev.c                 | 2 +-
 include/net/devlink.h                       | 2 +-
 net/core/devlink.c                          | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx4/crdump.c +1 -1
index eaf08f7ad128..64ed725aec28 100644
@@ -182,7 +182,7 @@ int mlx4_crdump_collect(struct mlx4_dev *dev)
 	crdump_enable_crspace_access(dev, cr_space);
 
 	/* Get the available snapshot ID for the dumps */
-	id = devlink_region_shapshot_id_get(devlink);
+	id = devlink_region_snapshot_id_get(devlink);
 
 	/* Try to capture dumps */
 	mlx4_crdump_collect_crspace(dev, cr_space, id);
drivers/net/netdevsim/dev.c +1 -1
index 059711edfc61..4b39aba2e9c4 100644
@@ -53,7 +53,7 @@ static ssize_t nsim_dev_take_snapshot_write(struct file *file,
 
 	get_random_bytes(dummy_data, NSIM_DEV_DUMMY_REGION_SIZE);
 
-	id = devlink_region_shapshot_id_get(priv_to_devlink(nsim_dev));
+	id = devlink_region_snapshot_id_get(priv_to_devlink(nsim_dev));
 	err = devlink_region_snapshot_create(nsim_dev->dummy_region,
 					     dummy_data, id, kfree);
 	if (err) {
include/net/devlink.h +1 -1
index 47f87b2fcf63..38b4acb93f74 100644
@@ -938,7 +938,7 @@ struct devlink_region *devlink_region_create(struct devlink *devlink,
 					     u32 region_max_snapshots,
 					     u64 region_size);
 void devlink_region_destroy(struct devlink_region *region);
-u32 devlink_region_shapshot_id_get(struct devlink *devlink);
+u32 devlink_region_snapshot_id_get(struct devlink *devlink);
 int devlink_region_snapshot_create(struct devlink_region *region,
 				   u8 *data, u32 snapshot_id,
 				   devlink_snapshot_data_dest_t *data_destructor);
net/core/devlink.c +3 -3
index 4c63c9a4c09e..b6fc67dbd612 100644
@@ -7563,7 +7563,7 @@ void devlink_region_destroy(struct devlink_region *region)
 EXPORT_SYMBOL_GPL(devlink_region_destroy);
 
 /**
- *	devlink_region_shapshot_id_get - get snapshot ID
+ *	devlink_region_snapshot_id_get - get snapshot ID
  *
  *	This callback should be called when adding a new snapshot,
  *	Driver should use the same id for multiple snapshots taken
@@ -7571,7 +7571,7 @@ EXPORT_SYMBOL_GPL(devlink_region_destroy);
  *
  *	@devlink: devlink
  */
-u32 devlink_region_shapshot_id_get(struct devlink *devlink)
+u32 devlink_region_snapshot_id_get(struct devlink *devlink)
 {
 	u32 id;
 
@@ -7581,7 +7581,7 @@ u32 devlink_region_shapshot_id_get(struct devlink *devlink)
 
 	return id;
 }
-EXPORT_SYMBOL_GPL(devlink_region_shapshot_id_get);
+EXPORT_SYMBOL_GPL(devlink_region_snapshot_id_get);
 
 /**
  *	devlink_region_snapshot_create - create a new snapshot
Signature · 1 line
2.25.0.rc1
#1 lore raw

PATCH 2/2 doc: fix typo of snapshot in documentation

A couple of locations accidentally misspelled snapshot as shapshot.

---
 Documentation/admin-guide/devices.txt    | 2 +-
 Documentation/media/v4l-drivers/meye.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/admin-guide/devices.txt +1 -1
index 1c5d2281efc9..2a97aaec8b12 100644
@@ -319,7 +319,7 @@
 		182 = /dev/perfctr	Performance-monitoring counters
 		183 = /dev/hwrng	Generic random number generator
 		184 = /dev/cpu/microcode CPU microcode update interface
-		186 = /dev/atomicps	Atomic shapshot of process state data
+		186 = /dev/atomicps	Atomic snapshot of process state data
 		187 = /dev/irnet	IrNET device
 		188 = /dev/smbusbios	SMBus BIOS
 		189 = /dev/ussp_ctl	User space serial port control
Documentation/media/v4l-drivers/meye.rst +1 -1
index a572996cdbf6..dc57a6a91b43 100644
@@ -95,7 +95,7 @@ so all video4linux tools (like xawtv) should work with this driver.
 
 Besides the video4linux interface, the driver has a private interface
 for accessing the Motion Eye extended parameters (camera sharpness,
-agc, video framerate), the shapshot and the MJPEG capture facilities.
+agc, video framerate), the snapshot and the MJPEG capture facilities.
 
 This interface consists of several ioctls (prototypes and structures
 can be found in include/linux/meye.h):
Signature · 1 line
2.25.0.rc1
#2 lore raw

Re: [PATCH 2/2] doc: fix typo of snapshot in documentation

Quoted 13 lines · On Thu, 9 Jan 2020 11:08:21 -0800 Jacob Keller <[email protected]>…

A couple of locations accidentally misspelled snapshot as shapshot.

---
 Documentation/admin-guide/devices.txt    | 2 +-
 Documentation/media/v4l-drivers/meye.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/admin-guide/devices.txt +0 -0
index 1c5d2281efc9..2a97aaec8b12 100644

Documentation/admin-guide/devices.txt line 323

Quoted 6 lines
Documentation/admin-guide/devices.txt +1 -1
@@ -319,7 +319,7 @@
 		182 = /dev/perfctr	Performance-monitoring counters
 		183 = /dev/hwrng	Generic random number generator
 		184 = /dev/cpu/microcode CPU microcode update interface
-		186 = /dev/atomicps	Atomic shapshot of process state data
+		186 = /dev/atomicps	Atomic snapshot of process state data
 		187 = /dev/irnet	IrNET device

Oops, irnet is part of irda which is no longer part of the kernel.

#3 lore raw

Re: [PATCH 2/2] doc: fix typo of snapshot in documentation

Quoted 11 lines · Stephen Hemminger
Quoted 8 lines · On Thu, 9 Jan 2020 11:08:21 -0800 Jacob Keller <[email protected]>…

A couple of locations accidentally misspelled snapshot as shapshot.

---
 Documentation/admin-guide/devices.txt    | 2 +-
 Documentation/media/v4l-drivers/meye.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 14 lines

Documentation/admin-guide/devices.txt line 323

Quoted 11 lines
Documentation/admin-guide/devices.txt +1 -1
index 1c5d2281efc9..2a97aaec8b12 100644
@@ -319,7 +319,7 @@
 		182 = /dev/perfctr	Performance-monitoring counters
 		183 = /dev/hwrng	Generic random number generator
 		184 = /dev/cpu/microcode CPU microcode update interface
-		186 = /dev/atomicps	Atomic shapshot of process state data
+		186 = /dev/atomicps	Atomic snapshot of process state data
 		187 = /dev/irnet	IrNET device

Oops, irnet is part of irda which is no longer part of the kernel.

This is probably based on the wrong tree. Will rebase and re-send.

Thanks,
Jake

#4 lore raw

Re: [PATCH 2/2] doc: fix typo of snapshot in documentation

Quoted 27 lines · Jacob Keller
Quoted 11 lines · Stephen Hemminger
Quoted 8 lines · On Thu, 9 Jan 2020 11:08:21 -0800 Jacob Keller <[email protected]>…

A couple of locations accidentally misspelled snapshot as shapshot.

---
 Documentation/admin-guide/devices.txt    | 2 +-
 Documentation/media/v4l-drivers/meye.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 14 lines

Documentation/admin-guide/devices.txt line 323

Quoted 11 lines
Documentation/admin-guide/devices.txt +1 -1
index 1c5d2281efc9..2a97aaec8b12 100644
@@ -319,7 +319,7 @@
 		182 = /dev/perfctr	Performance-monitoring counters
 		183 = /dev/hwrng	Generic random number generator
 		184 = /dev/cpu/microcode CPU microcode update interface
-		186 = /dev/atomicps	Atomic shapshot of process state data
+		186 = /dev/atomicps	Atomic snapshot of process state data
 		187 = /dev/irnet	IrNET device

Oops, irnet is part of irda which is no longer part of the kernel.

Quoted 4 lines

This is probably based on the wrong tree. Will rebase and re-send.

Thanks,
Jake>

Well, I did rebase the patches locally but the contents are still the same so I'm not going to resend. I guess it's just because the devices.txt file hasn't been updated?

-Jake

#5 lore raw

Re: [PATCH 2/2] doc: fix typo of snapshot in documentation

Quoted 30 lines · On Thu, 9 Jan 2020 12:11:36 -0800 Jacob Keller <[email protected]> wrote:
Quoted 29 lines · Jacob Keller
Quoted 11 lines · Stephen Hemminger
Quoted 8 lines · On Thu, 9 Jan 2020 11:08:21 -0800 Jacob Keller <[email protected]>…

A couple of locations accidentally misspelled snapshot as shapshot.

---
 Documentation/admin-guide/devices.txt    | 2 +-
 Documentation/media/v4l-drivers/meye.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 14 lines

Documentation/admin-guide/devices.txt line 323

Quoted 11 lines
Documentation/admin-guide/devices.txt +1 -1
index 1c5d2281efc9..2a97aaec8b12 100644
@@ -319,7 +319,7 @@
 		182 = /dev/perfctr	Performance-monitoring counters
 		183 = /dev/hwrng	Generic random number generator
 		184 = /dev/cpu/microcode CPU microcode update interface
-		186 = /dev/atomicps	Atomic shapshot of process state data
+		186 = /dev/atomicps	Atomic snapshot of process state data
 		187 = /dev/irnet	IrNET device  

Oops, irnet is part of irda which is no longer part of the kernel.

This is probably based on the wrong tree. Will rebase and re-send.

Quoted 8 lines
Quoted 2 lines

Thanks,
Jake>

Well, I did rebase the patches locally but the contents are still the same so I'm not going to resend. I guess it's just because the devices.txt file hasn't been updated?

-Jake

Yes, it looks like references to irnet were never deleted.

maintainer Acked-by on v1 1/2
#7 lore raw
In reply to Jacob Keller
Quoted 5 lines · Thu, Jan 09, 2020 at 08:08:20PM CET, [email protected] wrote:

The function to obtain a unique snapshot id was mistakenly typo'd as devlink_region_shapshot_id_get. Fix this typo by renaming the function and all of its users.

If you want to send this as a patchset, please provide a cover letter.

This patch looks fine to me.

#8 lore raw
Quoted 5 lines · Jiri Pirko
Quoted 4 lines · Thu, Jan 09, 2020 at 08:08:20PM CET, [email protected] wrote:

The function to obtain a unique snapshot id was mistakenly typo'd as devlink_region_shapshot_id_get. Fix this typo by renaming the function and all of its users.

Quoted 8 lines
Quoted 1 line

If you want to send this as a patchset, please provide a cover letter.

This patch looks fine to me.

I don't really care about it being merged as a series, I just searched for the shapshot typo and tried to fix it everywhere.

It doesn't seem worth the effort to resend with a cover letter..

Thanks,
Jake