diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2021-03-30 08:43:21 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2021-04-23 11:14:06 +0000 |
| commit | 1f13502192bc42a517c618ed1ada494e6a5471a5 (patch) | |
| tree | 5a915316d06056ce9a300bc41b9e16441516d07a | |
| parent | cd317a92133140ad78f296af5315cd8ffb08b046 (diff) | |
| download | src-1f13502192bc42a517c618ed1ada494e6a5471a5.tar.gz src-1f13502192bc42a517c618ed1ada494e6a5471a5.zip | |
linuxkpi: rename cdev to ldev
(cherry picked from commit 28b482e2baf43cdd30e8b9bd090e6d9f405cf4b3)
| -rw-r--r-- | sys/compat/linuxkpi/common/src/linux_compat.c | 6 | ||||
| -rw-r--r-- | sys/compat/linuxkpi/common/src/linux_compat.c.orig | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index a9fa50ded219..45ccd1279057 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -2213,12 +2213,12 @@ linux_cdev_release(struct kobject *kobj) static void linux_cdev_static_release(struct kobject *kobj) { - struct linux_cdev *cdev; + struct linux_cdev *ldev; struct kobject *parent; - cdev = container_of(kobj, struct linux_cdev, kobj); + ldev = container_of(kobj, struct linux_cdev, kobj); parent = kobj->parent; - linux_destroy_dev(cdev); + linux_destroy_dev(ldev); kobject_put(parent); } diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c.orig b/sys/compat/linuxkpi/common/src/linux_compat.c.orig index 42f47b6e510a..b7a7ba8b4f18 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c.orig +++ b/sys/compat/linuxkpi/common/src/linux_compat.c.orig @@ -1520,8 +1520,9 @@ linux_file_close(struct file *file, struct thread *td) if (filp->f_vnode != NULL) vdrop(filp->f_vnode); linux_drop_fop(ldev); - if (filp->f_cdev != NULL) - linux_cdev_deref(filp->f_cdev); + ldev = filp->f_cdev; + if (ldev != NULL) + linux_cdev_deref(ldev); kfree(filp); return (error); |