android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "treewide: Change list_sort to use const pointers"

Browse Source 
This reverts commit 55e6f8b3c0 which is
commit 4f0f586bf0c898233d8f316f471a21db2abd522d upstream.

This commit is already in this branch, but in a different fashion, as
CFI is included here.  By having this version, there is a crc error that
is due to the use of typedefs.  Reverting this commit changes nothing
and fixes the CRC issue.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I97849a104acbc88599481f6c5c9d024570ec5c87
This commit is contained in:
Greg Kroah-Hartman 2021-10-01 17:04:29 +02:00
parent d69751309b
commit dcf0824c26
40 changed files with 68 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/kvm/vgic/vgic-its.c
View File

@ -2190,8 +2190,8 @@ static int vgic_its_restore_ite(struct vgic_its *its, u32 event_id,
return offset;
}
static int vgic_its_ite_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int vgic_its_ite_cmp(void *priv, struct list_head *a,
struct list_head *b)
{
struct its_ite *itea = container_of(a, struct its_ite, ite_list);
struct its_ite *iteb = container_of(b, struct its_ite, ite_list);
@ -2329,8 +2329,8 @@ static int vgic_its_restore_dte(struct vgic_its *its, u32 id,
return offset;
}
static int vgic_its_device_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int vgic_its_device_cmp(void *priv, struct list_head *a,
struct list_head *b)
{
struct its_device *deva = container_of(a, struct its_device, dev_list);
struct its_device *devb = container_of(b, struct its_device, dev_list);

3
arch/arm64/kvm/vgic/vgic.c
View File

@ -255,8 +255,7 @@ static struct kvm_vcpu *vgic_target_oracle(struct vgic_irq *irq)
* Return negative if "a" sorts before "b", 0 to preserve order, and positive
* to sort "b" before "a".
*/
static int vgic_irq_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int vgic_irq_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct vgic_irq *irqa = container_of(a, struct vgic_irq, ap_list);
struct vgic_irq *irqb = container_of(b, struct vgic_irq, ap_list);

3
block/blk-mq-sched.c
View File

@ -75,8 +75,7 @@ void blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx)
blk_mq_run_hw_queue(hctx, true);
}
static int sched_rq_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int sched_rq_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct request *rqa = container_of(a, struct request, queuelist);
struct request *rqb = container_of(b, struct request, queuelist);

3
block/blk-mq.c
View File

@ -1924,8 +1924,7 @@ void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,
spin_unlock(&ctx->lock);
}
static int plug_rq_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int plug_rq_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct request *rqa = container_of(a, struct request, queuelist);
struct request *rqb = container_of(b, struct request, queuelist);

3
drivers/acpi/nfit/core.c
View File

@ -1194,8 +1194,7 @@ static int __nfit_mem_init(struct acpi_nfit_desc *acpi_desc,
return 0;
}
static int nfit_mem_cmp(void *priv, const struct list_head *_a,
const struct list_head *_b)
static int nfit_mem_cmp(void *priv, struct list_head *_a, struct list_head *_b)
{
struct nfit_mem *a = container_of(_a, typeof(*a), list);
struct nfit_mem *b = container_of(_b, typeof(*b), list);

3
drivers/acpi/numa/hmat.c
View File

@ -558,8 +558,7 @@ static bool hmat_update_best(u8 type, u32 value, u32 *best)
return updated;
}
static int initiator_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int initiator_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct memory_initiator *ia;
struct memory_initiator *ib;

4
drivers/clk/keystone/sci-clk.c
View File

@ -503,8 +503,8 @@ static int ti_sci_scan_clocks_from_fw(struct sci_clk_provider *provider)
#else
static int _cmp_sci_clk_list(void *priv, const struct list_head *a,
const struct list_head *b)
static int _cmp_sci_clk_list(void *priv, struct list_head *a,
struct list_head *b)
{
struct sci_clk *ca = container_of(a, struct sci_clk, node);
struct sci_clk *cb = container_of(b, struct sci_clk, node);

3
drivers/gpu/drm/drm_modes.c
View File

@ -1290,8 +1290,7 @@ EXPORT_SYMBOL(drm_mode_prune_invalid);
* Negative if @lh_a is better than @lh_b, zero if they're equivalent, or
* positive if @lh_b is better than @lh_a.
*/
static int drm_mode_compare(void *priv, const struct list_head *lh_a,
const struct list_head *lh_b)
static int drm_mode_compare(void *priv, struct list_head *lh_a, struct list_head *lh_b)
{
struct drm_display_mode *a = list_entry(lh_a, struct drm_display_mode, head);
struct drm_display_mode *b = list_entry(lh_b, struct drm_display_mode, head);

3
drivers/gpu/drm/i915/gt/intel_engine_user.c
View File

@ -49,8 +49,7 @@ static const u8 uabi_classes[] = {
[VIDEO_ENHANCEMENT_CLASS] = I915_ENGINE_CLASS_VIDEO_ENHANCE,
};
static int engine_cmp(void *priv, const struct list_head *A,
const struct list_head *B)
static int engine_cmp(void *priv, struct list_head *A, struct list_head *B)
{
const struct intel_engine_cs *a =
container_of((struct rb_node *)A, typeof(*a), uabi_node);

2
drivers/gpu/drm/i915/gvt/debugfs.c
View File

@ -41,7 +41,7 @@ struct diff_mmio {
/* Compare two diff_mmio items. */
static int mmio_offset_compare(void *priv,
const struct list_head *a, const struct list_head *b)
struct list_head *a, struct list_head *b)
{
struct diff_mmio *ma;
struct diff_mmio *mb;

3
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
View File

@ -1075,8 +1075,7 @@ static int igt_ppgtt_shrink_boom(void *arg)
return exercise_ppgtt(arg, shrink_boom);
}
static int sort_holes(void *priv, const struct list_head *A,
const struct list_head *B)
static int sort_holes(void *priv, struct list_head *A, struct list_head *B)
{
struct drm_mm_node *a = list_entry(A, typeof(*a), hole_stack);
struct drm_mm_node *b = list_entry(B, typeof(*b), hole_stack);

4
drivers/gpu/drm/radeon/radeon_cs.c
View File

@ -394,8 +394,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)
return 0;
}
static int cmp_size_smaller_first(void *priv, const struct list_head *a,
const struct list_head *b)
static int cmp_size_smaller_first(void *priv, struct list_head *a,
struct list_head *b)
{
struct radeon_bo_list *la = list_entry(a, struct radeon_bo_list, tv.head);
struct radeon_bo_list *lb = list_entry(b, struct radeon_bo_list, tv.head);

3
drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c
View File

@ -83,8 +83,7 @@ usnic_uiom_interval_node_alloc(long int start, long int last, int ref_cnt,
return interval;
}
static int interval_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int interval_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct usnic_uiom_interval_node *node_a, *node_b;

2
drivers/interconnect/qcom/bcm-voter.c
View File

@ -39,7 +39,7 @@ struct bcm_voter {
u32 tcs_wait;
};
static int cmp_vcd(void *priv, const struct list_head *a, const struct list_head *b)
static int cmp_vcd(void *priv, struct list_head *a, struct list_head *b)
{
const struct qcom_icc_bcm *bcm_a =
list_entry(a, struct qcom_icc_bcm, list);

3
drivers/md/raid5.c
View File

@ -953,8 +953,7 @@ static void dispatch_bio_list(struct bio_list *tmp)
submit_bio_noacct(bio);
}
static int cmp_stripe(void *priv, const struct list_head *a,
const struct list_head *b)
static int cmp_stripe(void *priv, struct list_head *a, struct list_head *b)
{
const struct r5pending_data *da = list_entry(a,
struct r5pending_data, sibling);

4
drivers/misc/sram.c
View File

@ -144,8 +144,8 @@ static void sram_free_partitions(struct sram_dev *sram)
}
}
static int sram_reserve_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int sram_reserve_cmp(void *priv, struct list_head *a,
struct list_head *b)
{
struct sram_reserve *ra = list_entry(a, struct sram_reserve, list);
struct sram_reserve *rb = list_entry(b, struct sram_reserve, list);

3
drivers/pci/controller/cadence/pcie-cadence-host.c
View File

@ -345,8 +345,7 @@ static int cdns_pcie_host_bar_config(struct cdns_pcie_rc *rc,
return 0;
}
static int cdns_pcie_host_dma_ranges_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int cdns_pcie_host_dma_ranges_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct resource_entry *entry1, *entry2;

3
drivers/spi/spi-loopback-test.c
View File

@ -454,8 +454,7 @@ struct rx_ranges {
u8 *end;
};
static int rx_ranges_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int rx_ranges_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct rx_ranges *rx_a = list_entry(a, struct rx_ranges, list);
struct rx_ranges *rx_b = list_entry(b, struct rx_ranges, list);

3
fs/btrfs/raid56.c
View File

@ -1646,8 +1646,7 @@ struct btrfs_plug_cb {
/*
* rbios on the plug list are sorted for easier merging.
*/
static int plug_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int plug_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct btrfs_raid_bio *ra = container_of(a, struct btrfs_raid_bio,
plug_list);

3
fs/btrfs/tree-log.c
View File

@ -4070,8 +4070,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
return ret;
}
static int extent_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int extent_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct extent_map *em1, *em2;

3
fs/btrfs/volumes.c
View File

@ -1226,8 +1226,7 @@ static int open_fs_devices(struct btrfs_fs_devices *fs_devices,
return 0;
}
static int devid_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int devid_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct btrfs_device *dev1, *dev2;

4
fs/ext4/fsmap.c
View File

@ -354,8 +354,8 @@ static unsigned int ext4_getfsmap_find_sb(struct super_block *sb,
/* Compare two fsmap items. */
static int ext4_getfsmap_compare(void *priv,
const struct list_head *a,
const struct list_head *b)
struct list_head *a,
struct list_head *b)
{
struct ext4_fsmap *fa;
struct ext4_fsmap *fb;

3
fs/gfs2/glock.c
View File

@ -1744,8 +1744,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
spin_unlock(&gl->gl_lockref.lock);
}
static int glock_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int glock_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct gfs2_glock *gla, *glb;

2
fs/gfs2/log.c
View File

@ -605,7 +605,7 @@ void log_flush_wait(struct gfs2_sbd *sdp)
}
}
static int ip_cmp(void *priv, const struct list_head *a, const struct list_head *b)
static int ip_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct gfs2_inode *ipa, *ipb;

3
fs/gfs2/lops.c
View File

@ -627,8 +627,7 @@ static void gfs2_check_magic(struct buffer_head *bh)
kunmap_atomic(kaddr);
}
static int blocknr_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int blocknr_cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct gfs2_bufdata *bda, *bdb;

3
fs/iomap/buffered-io.c
View File

@ -1155,8 +1155,7 @@ iomap_ioend_try_merge(struct iomap_ioend *ioend, struct list_head *more_ioends,
EXPORT_SYMBOL_GPL(iomap_ioend_try_merge);
static int
iomap_ioend_compare(void *priv, const struct list_head *a,
const struct list_head *b)
iomap_ioend_compare(void *priv, struct list_head *a, struct list_head *b)
{
struct iomap_ioend *ia = container_of(a, struct iomap_ioend, io_list);
struct iomap_ioend *ib = container_of(b, struct iomap_ioend, io_list);

7
fs/ubifs/gc.c
View File

@ -102,8 +102,7 @@ static int switch_gc_head(struct ubifs_info *c)
* This function compares data nodes @a and @b. Returns %1 if @a has greater
* inode or block number, and %-1 otherwise.
*/
static int data_nodes_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int data_nodes_cmp(void *priv, struct list_head *a, struct list_head *b)
{
ino_t inuma, inumb;
struct ubifs_info *c = priv;
@ -146,8 +145,8 @@ static int data_nodes_cmp(void *priv, const struct list_head *a,
* first and sorted by length in descending order. Directory entry nodes go
* after inode nodes and are sorted in ascending hash valuer order.
*/
static int nondata_nodes_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int nondata_nodes_cmp(void *priv, struct list_head *a,
struct list_head *b)
{
ino_t inuma, inumb;
struct ubifs_info *c = priv;

4
fs/ubifs/replay.c
View File

@ -299,8 +299,8 @@ static int apply_replay_entry(struct ubifs_info *c, struct replay_entry *r)
* entries @a and @b by comparing their sequence numer. Returns %1 if @a has
* greater sequence number and %-1 otherwise.
*/
static int replay_entries_cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int replay_entries_cmp(void *priv, struct list_head *a,
struct list_head *b)
{
struct ubifs_info *c = priv;
struct replay_entry *ra, *rb;

4
fs/xfs/scrub/bitmap.c
View File

@ -63,8 +63,8 @@ xbitmap_init(
static int
xbitmap_range_cmp(
void *priv,
const struct list_head *a,
const struct list_head *b)
struct list_head *a,
struct list_head *b)
{
struct xbitmap_range *ap;
struct xbitmap_range *bp;

4
fs/xfs/xfs_bmap_item.c
View File

@ -265,8 +265,8 @@ xfs_trans_log_finish_bmap_update(
static int
xfs_bmap_update_diff_items(
void *priv,
const struct list_head *a,
const struct list_head *b)
struct list_head *a,
struct list_head *b)
{
struct xfs_bmap_intent *ba;
struct xfs_bmap_intent *bb;

6
fs/xfs/xfs_buf.c
View File

@ -2114,9 +2114,9 @@ xfs_buf_delwri_queue(
*/
static int
xfs_buf_cmp(
void *priv,
const struct list_head *a,
const struct list_head *b)
void *priv,
struct list_head *a,
struct list_head *b)
{
struct xfs_buf *ap = container_of(a, struct xfs_buf, b_list);
struct xfs_buf *bp = container_of(b, struct xfs_buf, b_list);

4
fs/xfs/xfs_extent_busy.c
View File

@ -643,8 +643,8 @@ xfs_extent_busy_wait_all(
int
xfs_extent_busy_ag_cmp(
void *priv,
const struct list_head *l1,
const struct list_head *l2)
struct list_head *l1,
struct list_head *l2)
{
struct xfs_extent_busy *b1 =
container_of(l1, struct xfs_extent_busy, list);

3
fs/xfs/xfs_extent_busy.h
View File

@ -58,8 +58,7 @@ void
xfs_extent_busy_wait_all(struct xfs_mount *mp);
int
xfs_extent_busy_ag_cmp(void *priv, const struct list_head *a,
const struct list_head *b);
xfs_extent_busy_ag_cmp(void *priv, struct list_head *a, struct list_head *b);
static inline void xfs_extent_busy_sort(struct list_head *list)
{

4
fs/xfs/xfs_extfree_item.c
View File

@ -397,8 +397,8 @@ xfs_trans_free_extent(
static int
xfs_extent_free_diff_items(
void *priv,
const struct list_head *a,
const struct list_head *b)
struct list_head *a,
struct list_head *b)
{
struct xfs_mount *mp = priv;
struct xfs_extent_free_item *ra;

4
fs/xfs/xfs_refcount_item.c
View File

@ -269,8 +269,8 @@ xfs_trans_log_finish_refcount_update(
static int
xfs_refcount_update_diff_items(
void *priv,
const struct list_head *a,
const struct list_head *b)
struct list_head *a,
struct list_head *b)
{
struct xfs_mount *mp = priv;
struct xfs_refcount_intent *ra;

4
fs/xfs/xfs_rmap_item.c
View File

@ -337,8 +337,8 @@ xfs_trans_log_finish_rmap_update(
static int
xfs_rmap_update_diff_items(
void *priv,
const struct list_head *a,
const struct list_head *b)
struct list_head *a,
struct list_head *b)
{
struct xfs_mount *mp = priv;
struct xfs_rmap_intent *ra;

7
include/linux/list_sort.h
View File

@ -6,9 +6,8 @@
struct list_head;
typedef int __attribute__((nonnull(2,3))) (*list_cmp_func_t)(void *,
const struct list_head *, const struct list_head *);
__attribute__((nonnull(2,3)))
void list_sort(void *priv, struct list_head *head, list_cmp_func_t cmp);
void list_sort(void *priv, struct list_head *head,
int (*cmp)(void *priv, struct list_head *a,
struct list_head *b));
#endif

11
lib/list_sort.c
View File

@ -7,13 +7,16 @@
#include <linux/list_sort.h>
#include <linux/list.h>
typedef int __attribute__((nonnull(2,3))) (*cmp_func)(void *,
struct list_head *, struct list_head *);
/*
* Returns a list organized in an intermediate format suited
* to chaining of merge() calls: null-terminated, no reserved or
* sentinel head node, "prev" links not maintained.
*/
__attribute__((nonnull(2,3,4)))
static struct list_head *merge(void *priv, list_cmp_func_t cmp,
static struct list_head *merge(void *priv, cmp_func cmp,
struct list_head *a, struct list_head *b)
{
struct list_head *head, **tail = &head;
@ -49,7 +52,7 @@ static struct list_head *merge(void *priv, list_cmp_func_t cmp,
* throughout.
*/
__attribute__((nonnull(2,3,4,5)))
static void merge_final(void *priv, list_cmp_func_t cmp, struct list_head *head,
static void merge_final(void *priv, cmp_func cmp, struct list_head *head,
struct list_head *a, struct list_head *b)
{
struct list_head *tail = head;
@ -182,7 +185,9 @@ static void merge_final(void *priv, list_cmp_func_t cmp, struct list_head *head,
* 2^(k+1) - 1 (second merge of case 5 when x == 2^(k-1) - 1).
*/
__attribute__((nonnull(2,3)))
void list_sort(void *priv, struct list_head *head, list_cmp_func_t cmp)
void list_sort(void *priv, struct list_head *head,
int (*cmp)(void *priv, struct list_head *a,
struct list_head *b))
{
struct list_head *list = head->next, *pending = NULL;
size_t count = 0; /* Count of pending */

3
lib/test_list_sort.c
View File

@ -56,8 +56,7 @@ static int __init check(struct debug_el *ela, struct debug_el *elb)
return 0;
}
static int __init cmp(void *priv, const struct list_head *a,
const struct list_head *b)
static int __init cmp(void *priv, struct list_head *a, struct list_head *b)
{
struct debug_el *ela, *elb;

4
net/tipc/name_table.c
View File

@ -381,8 +381,8 @@ static struct publication *tipc_service_remove_publ(struct service_range *sr,
* Code reused: time_after32() for the same purpose
*/
#define publication_after(pa, pb) time_after32((pa)->id, (pb)->id)
static int tipc_publ_sort(void *priv, const struct list_head *a,
const struct list_head *b)
static int tipc_publ_sort(void *priv, struct list_head *a,
struct list_head *b)
{
struct publication *pa, *pb;