# git rev-parse -q --verify b8d5109f50969ead9d49c3e8bd78ec1f82e548e3^{commit} b8d5109f50969ead9d49c3e8bd78ec1f82e548e3 already have revision, skipping fetch # git checkout -q -f -B kisskb b8d5109f50969ead9d49c3e8bd78ec1f82e548e3 # git clean -qxdf # < git log -1 # commit b8d5109f50969ead9d49c3e8bd78ec1f82e548e3 # Author: Linus Torvalds # Date: Sun Jul 3 14:40:28 2022 -0700 # # lockref: remove unused 'lockref_get_or_lock()' function # # Looking at the conditional lock acquire functions in the kernel due to # the new sparse support (see commit 4a557a5d1a61 "sparse: introduce # conditional lock acquire function attribute"), it became obvious that # the lockref code has a couple of them, but they don't match the usual # naming convention for the other ones, and their return value logic is # also reversed. # # In the other very similar places, the naming pattern is '*_and_lock()' # (eg 'atomic_put_and_lock()' and 'refcount_dec_and_lock()'), and the # function returns true when the lock is taken. # # The lockref code is superficially very similar to the refcount code, # only with the special "atomic wrt the embedded lock" semantics. But # instead of the '*_and_lock()' naming it uses '*_or_lock()'. # # And instead of returning true in case it took the lock, it returns true # if it *didn't* take the lock. # # Now, arguably the reflock code is quite logical: it really is a "either # decrement _or_ lock" kind of situation - and the return value is about # whether the operation succeeded without any special care needed. # # So despite the similarities, the differences do make some sense, and # maybe it's not worth trying to unify the different conditional locking # primitives in this area. # # But while looking at this all, it did become obvious that the # 'lockref_get_or_lock()' function hasn't actually had any users for # almost a decade. # # The only user it ever had was the shortlived 'd_rcu_to_refcount()' # function, and it got removed and replaced with 'lockref_get_not_dead()' # back in 2013 in commits 0d98439ea3c6 ("vfs: use lockred 'dead' flag to # mark unrecoverably dead dentries") and e5c832d55588 ("vfs: fix dentry # RCU to refcounting possibly sleeping dput()") # # In fact, that single use was removed less than a week after the whole # function was introduced in commit b3abd80250c1 ("lockref: add # 'lockref_get_or_lock() helper") so this function has been around for a # decade, but only had a user for six days. # # Let's just put this mis-designed and unused function out of its misery. # # We can think about the naming and semantic oddities of the remaining # 'lockref_put_or_lock()' later, but at least that function has users. # # And while the naming is different and the return value doesn't match, # that function matches the whole '{atomic,refcount}_dec_and_test()' # pattern much better (ie the magic happens when the count goes down to # zero, not when it is incremented from zero). # # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 b8d5109f50969ead9d49c3e8bd78ec1f82e548e3 # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/machvec.c: In function 'sh_mv_setup': /kisskb/src/arch/sh/kernel/machvec.c:105:33: error: array subscript 'struct sh_machine_vector[0]' is partly outside array bounds of 'long int[1]' [-Werror=array-bounds] 105 | sh_mv = *(struct sh_machine_vector *)&__machvec_start; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/sh/kernel/machvec.c:13: /kisskb/src/arch/sh/include/asm/sections.h:7:13: note: while referencing '__machvec_start' 7 | extern long __machvec_start, __machvec_end; | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sh/kernel/machvec.o] Error 1 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:594, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:31: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:9: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:9: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:34: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sh/kernel/cpu/sh2/setup-sh7619.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:466: arch/sh/kernel/cpu/sh2] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:466: arch/sh/kernel/cpu] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: arch/sh/kernel] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1843: arch/sh] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/tty/serial/sh-sci.c: In function 'sci_remap_port': /kisskb/src/drivers/tty/serial/sh-sci.c:2655:26: error: unused variable 'sport' [-Werror=unused-variable] 2655 | struct sci_port *sport = to_sci_port(port); | ^~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/tty/serial/sh-sci.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/tty/serial] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/tty] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1843: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh-allmodconfig_sh4-gcc11 # Build took: 0:04:47.341915