Skip to content

RFC remove duplicate ifdefs

Shrikanth Hegde linux-xfs linuxppc-dev lkml 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 RFC Latest4 patches 0 repliesNew
  2. v1 RFC3 patches 3 repliesSuperseded

v2->v1 from the cover letter

split the fs change into two patches as suggested by Chandan Babu R.
v1: https://lore.kernel.org/all/[email protected]/

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4sched: remove duplicate ifdefskernel/sched/core.c kernel/sched/fair.c+1 -50 replies
2/4xfs: remove duplicate ifdefsfs/xfs/xfs_sysfs.c+0 -40 replies
3/4ntfs: remove duplicate ifdefsfs/ntfs/inode.c+0 -20 replies
4/4arch/powerpc: remove duplicate ifdefsarch/powerpc/include/asm/paca.h arch/powerpc/kernel/asm-offsets.c arch/powerpc/platforms/powermac/feature.c +1 more+0 -100 replies

Reviews trailers per patch

1 of 4 patches has a Reviewed-by or Acked-by.

PatchDarrick J. Wong
1/4
2/4R-b
3/4
4/4

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [RFC PATCH v2 0/4] remove duplicate ifdefs

When going through the code observed a case in scheduler, where #ifdef CONFIG_SMP was used to inside an #ifdef CONFIG_SMP. That didn't make sense since first one is good enough and second one is a duplicate.

This could improve code readability. No functional change is intended.

Since this might be present in other code areas wrote a very basic python script which helps in finding these cases. It doesn't handle any complicated #defines or space separated "# if". At some places the log collected had to be manually corrected due to space separated ifdefs. Thats why its not a treewide change.
There might be an opportunity for other files as well.

Logic is very simple. If there is #ifdef or #if or #ifndef add that variable to list. Upon every subsequent #ifdef or #if or #ifndef check if the same variable is in the list. If yes flag
an error. Verification was done manually later checking for any #undef or any error due to script. These were the ones that flagged out and made sense after going through code.

More details about how the logs were collected and the script used for processing the logs are mentioned in v1 cover letter.

v2->v1:
split the fs change into two patches as suggested by Chandan Babu R.
v1: https://lore.kernel.org/all/[email protected]/

Shrikanth Hegde (4):
sched: remove duplicate ifdefs
xfs: remove duplicate ifdefs
ntfs: remove duplicate ifdefs
arch/powerpc: remove duplicate ifdefs

 arch/powerpc/include/asm/paca.h           | 4 ----
 arch/powerpc/kernel/asm-offsets.c         | 2 --
 arch/powerpc/platforms/powermac/feature.c | 2 --
 arch/powerpc/xmon/xmon.c                  | 2 --
 fs/ntfs/inode.c                           | 2 --
 fs/xfs/xfs_sysfs.c                        | 4 ----
 kernel/sched/core.c                       | 4 +---
 kernel/sched/fair.c                       | 2 --
 8 files changed, 1 insertion(+), 21 deletions(-)

--
2.39.3