History

block: remove CONFIG_LBDAF

Currently support for 64-bit sector_t and blkcnt_t is optional on 32-bit architectures. These types are required to support block device and/or file sizes larger than 2 TiB, and have generally defaulted to on for a long time. Enabling the option only increases the i386 tinyconfig size by 145 bytes, and many data structures already always use 64-bit values for their in-core and on-disk data structures anyway, so there should not be a large change in dynamic memory usage either. Dropping this option removes a somewhat weird non-default config that has cause various bugs or compiler warnings when actually used.

Christoph Hellwig committed 7 years ago

Commit 72deb451 parent 75199aa61 files · +52 −250Browse files

Unified · Split

61 files
  1. Documentation/process/submit-checklist.rst +12 −15
  2. Documentation/translations/ja_JP/SubmitChecklist +9 −13
  3. arch/arc/configs/haps_hs_defconfig +0 −1
  4. arch/arc/configs/haps_hs_smp_defconfig +0 −1
  5. arch/arc/configs/nsim_700_defconfig +0 −1
  6. arch/arc/configs/nsim_hs_defconfig +0 −1
  7. arch/arc/configs/nsim_hs_smp_defconfig +0 −1
  8. arch/arc/configs/nsimosci_defconfig +0 −1
  9. arch/arc/configs/nsimosci_hs_defconfig +0 −1
  10. arch/arc/configs/nsimosci_hs_smp_defconfig +0 −1
  11. arch/arm/configs/aspeed_g4_defconfig +0 −1
  12. arch/arm/configs/aspeed_g5_defconfig +0 −1
  13. arch/arm/configs/at91_dt_defconfig +0 −1
  14. arch/arm/configs/clps711x_defconfig +0 −1
  15. arch/arm/configs/efm32_defconfig +0 −1
  16. arch/arm/configs/ezx_defconfig +0 −1
  17. arch/arm/configs/h3600_defconfig +0 −1
  18. arch/arm/configs/imote2_defconfig +0 −1
  19. arch/arm/configs/moxart_defconfig +0 −1
  20. arch/arm/configs/multi_v4t_defconfig +0 −1
  21. arch/arm/configs/omap1_defconfig +0 −1
  22. arch/arm/configs/stm32_defconfig +0 −1
  23. arch/arm/configs/u300_defconfig +0 −1
  24. arch/arm/configs/vexpress_defconfig +0 −1
  25. arch/m68k/configs/amcore_defconfig +0 −1
  26. arch/m68k/configs/m5475evb_defconfig +0 −1
  27. arch/m68k/configs/stmark2_defconfig +0 −1
  28. arch/mips/configs/ar7_defconfig +0 −1
  29. arch/mips/configs/decstation_defconfig +0 −1
  30. arch/mips/configs/decstation_r4k_defconfig +0 −1
  31. arch/mips/configs/loongson1b_defconfig +0 −1
  32. arch/mips/configs/loongson1c_defconfig +0 −1
  33. arch/mips/configs/rb532_defconfig +0 −1
  34. arch/mips/configs/rbtx49xx_defconfig +0 −1
  35. arch/parisc/configs/generic-32bit_defconfig +0 −1
  36. arch/sh/configs/apsh4ad0a_defconfig +0 −1
  37. arch/sh/configs/ecovec24-romimage_defconfig +0 −1
  38. arch/sh/configs/rsk7264_defconfig +0 −1
  39. arch/sh/configs/rsk7269_defconfig +0 −1
  40. arch/sh/configs/sh7785lcr_32bit_defconfig +0 −1
  41. block/Kconfig +0 −24
  42. drivers/block/drbd/drbd_int.h +0 −5
  43. drivers/block/ps3disk.c +2 −2
  44. drivers/md/dm-exception-store.h +2 −26
  45. drivers/md/dm-integrity.c +2 −6
  46. drivers/md/md.c +2 −4
  47. drivers/nvdimm/pfn_devs.c +2 −2
  48. drivers/scsi/sd.c +0 −32
  49. fs/ext4/resize.c +0 −2
  50. fs/ext4/super.c +7 −25
  51. fs/gfs2/Kconfig +0 −1
  52. fs/nfs/Kconfig +0 −1
  53. fs/ocfs2/super.c +0 −10
  54. fs/stack.c +7 −8
  55. fs/xfs/Kconfig +0 −1
  56. fs/xfs/xfs_super.c +1 −9
  57. include/linux/genhd.h +4 −4
  58. include/linux/kernel.h +2 −12
  59. include/linux/types.h +0 −5
  60. lib/Kconfig.debug +0 −1
  61. tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h +0 −4
Documentation/process/submit-checklist.rst+12−15
@@ -72,47 +72,44 @@ and elsewhere regarding submitting Linux kernel patches. · 71 unmodified lines
7272 13) Has been build- and runtime tested with and without ``CONFIG_SMP`` and
7373 ``CONFIG_PREEMPT.``
7474
75−14) If the patch affects IO/Disk, etc: has been tested with and without
76− ``CONFIG_LBDAF.``
75+16) All codepaths have been exercised with all lockdep features enabled.
7776
78−15) All codepaths have been exercised with all lockdep features enabled.
77+17) All new ``/proc`` entries are documented under ``Documentation/``
7978
80−16) All new ``/proc`` entries are documented under ``Documentation/``
81−
82−17) All new kernel boot parameters are documented in
79+18) All new kernel boot parameters are documented in
8380 ``Documentation/admin-guide/kernel-parameters.rst``.
8481
85−18) All new module parameters are documented with ``MODULE_PARM_DESC()``
82+19) All new module parameters are documented with ``MODULE_PARM_DESC()``
8683
87−19) All new userspace interfaces are documented in ``Documentation/ABI/``.
84+20) All new userspace interfaces are documented in ``Documentation/ABI/``.
8885 See ``Documentation/ABI/README`` for more information.
8986 Patches that change userspace interfaces should be CCed to
9087 linux-api@vger.kernel.org.
9188
92−20) Check that it all passes ``make headers_check``.
89+21) Check that it all passes ``make headers_check``.
9390
94−21) Has been checked with injection of at least slab and page-allocation
91+22) Has been checked with injection of at least slab and page-allocation
9592 failures. See ``Documentation/fault-injection/``.
9693
9794 If the new code is substantial, addition of subsystem-specific fault
9895 injection might be appropriate.
9996
100−22) Newly-added code has been compiled with ``gcc -W`` (use
97+23) Newly-added code has been compiled with ``gcc -W`` (use
10198 ``make EXTRA_CFLAGS=-W``). This will generate lots of noise, but is good
10299 for finding bugs like "warning: comparison between signed and unsigned".
103100
104−23) Tested after it has been merged into the -mm patchset to make sure
101+24) Tested after it has been merged into the -mm patchset to make sure
105102 that it still works with all of the other queued patches and various
106103 changes in the VM, VFS, and other subsystems.
107104
108−24) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a
105+25) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a
109106 comment in the source code that explains the logic of what they are doing
110107 and why.
111108
112−25) If any ioctl's are added by the patch, then also update
109+26) If any ioctl's are added by the patch, then also update
113110 ``Documentation/ioctl/ioctl-number.txt``.
114111
115−26) If your modified source code depends on or uses any of the kernel
112+27) If your modified source code depends on or uses any of the kernel
116113 APIs or features that are related to the following ``Kconfig`` symbols,
117114 then test multiple builds with the related ``Kconfig`` symbols disabled
118115 and/or ``=m`` (if that option is available) [not all of these at the
Documentation/translations/ja_JP/SubmitChecklist+9−13
@@ -74,38 +74,34 @@ Linux カーネルパッチ投稿者向けチェックリスト · 73 unmodified lines
7474 13: CONFIG_SMP, CONFIG_PREEMPT を有効にした場合と無効にした場合の両方で
7575 ビルドした上、動作確認を行ってください。
7676
77−14: もしパッチがディスクのI/O性能などに影響を与えるようであれば、
78− 'CONFIG_LBDAF'オプションを有効にした場合と無効にした場合の両方で
79− テストを実施してみてください。
77+14: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。
8078
81−15: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。
82−
83−16: /proc に新しいエントリを追加した場合には、Documentation/ 配下に
79+15: /proc に新しいエントリを追加した場合には、Documentation/ 配下に
8480 必ずドキュメントを追加してください。
8581
86−17: 新しいブートパラメータを追加した場合には、
82+16: 新しいブートパラメータを追加した場合には、
8783 必ずDocumentation/admin-guide/kernel-parameters.rst に説明を追加してください。
8884
89−18: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を
85+17: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を
9086 利用して必ずその説明を記述してください。
9187
92−19: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に
88+18: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に
9389 Documentation/ABI/README を参考にして必ずドキュメントを追加してください。
9490
95−20: 'make headers_check'を実行して全く問題がないことを確認してください。
91+19: 'make headers_check'を実行して全く問題がないことを確認してください。
9692
97−21: 少なくともslabアロケーションとpageアロケーションに失敗した場合の
93+20: 少なくともslabアロケーションとpageアロケーションに失敗した場合の
9894 挙動について、fault-injectionを利用して確認してください。
9995 Documentation/fault-injection/ を参照してください。
10096
10197 追加したコードがかなりの量であったならば、サブシステム特有の
10298 fault-injectionを追加したほうが良いかもしれません。
10399
104−22: 新たに追加したコードは、`gcc -W'でコンパイルしてください。
100+21: 新たに追加したコードは、`gcc -W'でコンパイルしてください。
105101 このオプションは大量の不要なメッセージを出力しますが、
106102 "warning: comparison between signed and unsigned" のようなメッセージは、
107103 バグを見つけるのに役に立ちます。
108104
109−23: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや
105+22: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや
110106 VM, VFS およびその他のサブシステムに関する様々な変更と、現時点でも共存
111107 できることを確認するテストを行ってください。
arch/arc/configs/haps_hs_defconfig+0−1
@@ -15,7 +15,6 @@ CONFIG_PERF_EVENTS=y · 14 unmodified lines
1515 # CONFIG_COMPAT_BRK is not set
1616 CONFIG_SLAB=y
1717 CONFIG_MODULES=y
18−# CONFIG_LBDAF is not set
1918 # CONFIG_BLK_DEV_BSG is not set
2019 # CONFIG_IOSCHED_DEADLINE is not set
2120 # CONFIG_IOSCHED_CFQ is not set
arch/arc/configs/haps_hs_smp_defconfig+0−1
@@ -17,7 +17,6 @@ CONFIG_PERF_EVENTS=y · 16 unmodified lines
1717 CONFIG_SLAB=y
1818 CONFIG_KPROBES=y
1919 CONFIG_MODULES=y
20−# CONFIG_LBDAF is not set
2120 # CONFIG_BLK_DEV_BSG is not set
2221 # CONFIG_IOSCHED_DEADLINE is not set
2322 # CONFIG_IOSCHED_CFQ is not set
arch/arc/configs/nsim_700_defconfig+0−1
@@ -18,7 +18,6 @@ CONFIG_PERF_EVENTS=y · 17 unmodified lines
1818 CONFIG_ISA_ARCOMPACT=y
1919 CONFIG_KPROBES=y
2020 CONFIG_MODULES=y
21−# CONFIG_LBDAF is not set
2221 # CONFIG_BLK_DEV_BSG is not set
2322 # CONFIG_IOSCHED_DEADLINE is not set
2423 # CONFIG_IOSCHED_CFQ is not set
arch/arc/configs/nsim_hs_defconfig+0−1
@@ -20,7 +20,6 @@ CONFIG_MODULES=y · 19 unmodified lines
2020 CONFIG_MODULE_FORCE_LOAD=y
2121 CONFIG_MODULE_UNLOAD=y
2222 CONFIG_MODULE_FORCE_UNLOAD=y
23−# CONFIG_LBDAF is not set
2423 # CONFIG_BLK_DEV_BSG is not set
2524 # CONFIG_IOSCHED_DEADLINE is not set
2625 # CONFIG_IOSCHED_CFQ is not set
arch/arc/configs/nsim_hs_smp_defconfig+0−1
@@ -18,7 +18,6 @@ CONFIG_MODULES=y · 17 unmodified lines
1818 CONFIG_MODULE_FORCE_LOAD=y
1919 CONFIG_MODULE_UNLOAD=y
2020 CONFIG_MODULE_FORCE_UNLOAD=y
21−# CONFIG_LBDAF is not set
2221 # CONFIG_BLK_DEV_BSG is not set
2322 # CONFIG_IOSCHED_DEADLINE is not set
2423 # CONFIG_IOSCHED_CFQ is not set
arch/arc/configs/nsimosci_defconfig+0−1
@@ -18,7 +18,6 @@ CONFIG_PERF_EVENTS=y · 17 unmodified lines
1818 CONFIG_ISA_ARCOMPACT=y
1919 CONFIG_KPROBES=y
2020 CONFIG_MODULES=y
21−# CONFIG_LBDAF is not set
2221 # CONFIG_BLK_DEV_BSG is not set
2322 # CONFIG_IOSCHED_DEADLINE is not set
2423 # CONFIG_IOSCHED_CFQ is not set
arch/arc/configs/nsimosci_hs_defconfig+0−1
@@ -17,7 +17,6 @@ CONFIG_PERF_EVENTS=y · 16 unmodified lines
1717 # CONFIG_COMPAT_BRK is not set
1818 CONFIG_KPROBES=y
1919 CONFIG_MODULES=y
20−# CONFIG_LBDAF is not set
2120 # CONFIG_BLK_DEV_BSG is not set
2221 # CONFIG_IOSCHED_DEADLINE is not set
2322 # CONFIG_IOSCHED_CFQ is not set
arch/arc/configs/nsimosci_hs_smp_defconfig+0−1
@@ -12,7 +12,6 @@ CONFIG_PERF_EVENTS=y · 11 unmodified lines
1212 # CONFIG_COMPAT_BRK is not set
1313 CONFIG_KPROBES=y
1414 CONFIG_MODULES=y
15−# CONFIG_LBDAF is not set
1615 # CONFIG_BLK_DEV_BSG is not set
1716 # CONFIG_IOSCHED_DEADLINE is not set
1817 # CONFIG_IOSCHED_CFQ is not set
arch/arm/configs/aspeed_g4_defconfig+0−1
@@ -23,7 +23,6 @@ CONFIG_SLAB_FREELIST_RANDOM=y · 22 unmodified lines
2323 CONFIG_JUMP_LABEL=y
2424 CONFIG_STRICT_KERNEL_RWX=y
2525 CONFIG_GCC_PLUGINS=y
26−# CONFIG_LBDAF is not set
2726 # CONFIG_BLK_DEV_BSG is not set
2827 # CONFIG_BLK_DEBUG_FS is not set
2928 # CONFIG_IOSCHED_DEADLINE is not set
arch/arm/configs/aspeed_g5_defconfig+0−1
@@ -23,7 +23,6 @@ CONFIG_SLAB_FREELIST_RANDOM=y · 22 unmodified lines
2323 CONFIG_JUMP_LABEL=y
2424 CONFIG_STRICT_KERNEL_RWX=y
2525 CONFIG_GCC_PLUGINS=y
26−# CONFIG_LBDAF is not set
2726 # CONFIG_BLK_DEV_BSG is not set
2827 # CONFIG_BLK_DEBUG_FS is not set
2928 # CONFIG_IOSCHED_DEADLINE is not set
arch/arm/configs/at91_dt_defconfig+0−1
@@ -9,7 +9,6 @@ CONFIG_EMBEDDED=y · 8 unmodified lines
99 CONFIG_SLAB=y
1010 CONFIG_MODULES=y
1111 CONFIG_MODULE_UNLOAD=y
12−# CONFIG_LBDAF is not set
1312 # CONFIG_BLK_DEV_BSG is not set
1413 # CONFIG_IOSCHED_DEADLINE is not set
1514 # CONFIG_IOSCHED_CFQ is not set
arch/arm/configs/clps711x_defconfig+0−1
@@ -6,7 +6,6 @@ CONFIG_RD_LZMA=y · 5 unmodified lines
66 CONFIG_EMBEDDED=y
77 CONFIG_SLOB=y
88 CONFIG_JUMP_LABEL=y
9−# CONFIG_LBDAF is not set
109 CONFIG_PARTITION_ADVANCED=y
1110 # CONFIG_IOSCHED_CFQ is not set
1211 CONFIG_ARCH_CLPS711X=y
arch/arm/configs/efm32_defconfig+0−1
@@ -11,7 +11,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y · 10 unmodified lines
1111 CONFIG_EMBEDDED=y
1212 # CONFIG_VM_EVENT_COUNTERS is not set
1313 # CONFIG_SLUB_DEBUG is not set
14−# CONFIG_LBDAF is not set
1514 # CONFIG_BLK_DEV_BSG is not set
1615 # CONFIG_IOSCHED_DEADLINE is not set
1716 # CONFIG_IOSCHED_CFQ is not set
arch/arm/configs/ezx_defconfig+0−1
@@ -13,7 +13,6 @@ CONFIG_MODULES=y · 12 unmodified lines
1313 CONFIG_MODULE_UNLOAD=y
1414 CONFIG_MODULE_FORCE_UNLOAD=y
1515 CONFIG_MODVERSIONS=y
16−# CONFIG_LBDAF is not set
1716 # CONFIG_BLK_DEV_BSG is not set
1817 # CONFIG_IOSCHED_CFQ is not set
1918 CONFIG_ARCH_PXA=y
arch/arm/configs/h3600_defconfig+0−1
@@ -4,7 +4,6 @@ CONFIG_HIGH_RES_TIMERS=y · 3 unmodified lines
44 CONFIG_LOG_BUF_SHIFT=14
55 CONFIG_BLK_DEV_INITRD=y
66 CONFIG_MODULES=y
7−# CONFIG_LBDAF is not set
87 # CONFIG_BLK_DEV_BSG is not set
98 # CONFIG_IOSCHED_DEADLINE is not set
109 # CONFIG_IOSCHED_CFQ is not set
arch/arm/configs/imote2_defconfig+0−1
@@ -12,7 +12,6 @@ CONFIG_MODULES=y · 11 unmodified lines
1212 CONFIG_MODULE_UNLOAD=y
1313 CONFIG_MODULE_FORCE_UNLOAD=y
1414 CONFIG_MODVERSIONS=y
15−# CONFIG_LBDAF is not set
1615 # CONFIG_BLK_DEV_BSG is not set
1716 # CONFIG_IOSCHED_CFQ is not set
1817 CONFIG_ARCH_PXA=y
arch/arm/configs/moxart_defconfig+0−1
@@ -15,7 +15,6 @@ CONFIG_EMBEDDED=y · 14 unmodified lines
1515 # CONFIG_VM_EVENT_COUNTERS is not set
1616 # CONFIG_SLUB_DEBUG is not set
1717 # CONFIG_COMPAT_BRK is not set
18−# CONFIG_LBDAF is not set
1918 # CONFIG_BLK_DEV_BSG is not set
2019 # CONFIG_IOSCHED_DEADLINE is not set
2120 CONFIG_ARCH_MULTI_V4=y
arch/arm/configs/multi_v4t_defconfig+0−1
@@ -5,7 +5,6 @@ CONFIG_BLK_DEV_INITRD=y · 4 unmodified lines
55 CONFIG_EMBEDDED=y
66 CONFIG_SLOB=y
77 CONFIG_JUMP_LABEL=y
8−# CONFIG_LBDAF is not set
98 CONFIG_PARTITION_ADVANCED=y
109 # CONFIG_IOSCHED_CFQ is not set
1110 CONFIG_ARCH_MULTI_V4T=y
arch/arm/configs/omap1_defconfig+0−1
@@ -17,7 +17,6 @@ CONFIG_OPROFILE=y · 16 unmodified lines
1717 CONFIG_MODULES=y
1818 CONFIG_MODULE_UNLOAD=y
1919 CONFIG_MODULE_FORCE_UNLOAD=y
20−# CONFIG_LBDAF is not set
2120 # CONFIG_BLK_DEV_BSG is not set
2221 # CONFIG_IOSCHED_DEADLINE is not set
2322 # CONFIG_IOSCHED_CFQ is not set
arch/arm/configs/stm32_defconfig+0−1
@@ -13,7 +13,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y · 12 unmodified lines
1313 CONFIG_EMBEDDED=y
1414 # CONFIG_VM_EVENT_COUNTERS is not set
1515 # CONFIG_SLUB_DEBUG is not set
16−# CONFIG_LBDAF is not set
1716 # CONFIG_BLK_DEV_BSG is not set
1817 # CONFIG_IOSCHED_DEADLINE is not set
1918 # CONFIG_IOSCHED_CFQ is not set
arch/arm/configs/u300_defconfig+0−1
@@ -9,7 +9,6 @@ CONFIG_EXPERT=y · 8 unmodified lines
99 # CONFIG_VM_EVENT_COUNTERS is not set
1010 CONFIG_MODULES=y
1111 CONFIG_MODULE_UNLOAD=y
12−# CONFIG_LBDAF is not set
1312 # CONFIG_BLK_DEV_BSG is not set
1413 CONFIG_PARTITION_ADVANCED=y
1514 # CONFIG_IOSCHED_CFQ is not set
arch/arm/configs/vexpress_defconfig+0−1
@@ -14,7 +14,6 @@ CONFIG_PROFILING=y · 13 unmodified lines
1414 CONFIG_OPROFILE=y
1515 CONFIG_MODULES=y
1616 CONFIG_MODULE_UNLOAD=y
17−# CONFIG_LBDAF is not set
1817 # CONFIG_BLK_DEV_BSG is not set
1918 # CONFIG_IOSCHED_DEADLINE is not set
2019 # CONFIG_IOSCHED_CFQ is not set
arch/m68k/configs/amcore_defconfig+0−1
@@ -12,7 +12,6 @@ CONFIG_EMBEDDED=y · 11 unmodified lines
1212 # CONFIG_VM_EVENT_COUNTERS is not set
1313 # CONFIG_SLUB_DEBUG is not set
1414 # CONFIG_COMPAT_BRK is not set
15−# CONFIG_LBDAF is not set
1615 # CONFIG_BLK_DEV_BSG is not set
1716 # CONFIG_IOSCHED_CFQ is not set
1817 # CONFIG_MMU is not set
arch/m68k/configs/m5475evb_defconfig+0−1
@@ -11,7 +11,6 @@ CONFIG_SYSCTL_SYSCALL=y · 10 unmodified lines
1111 # CONFIG_AIO is not set
1212 CONFIG_EMBEDDED=y
1313 CONFIG_MODULES=y
14−# CONFIG_LBDAF is not set
1514 # CONFIG_BLK_DEV_BSG is not set
1615 # CONFIG_IOSCHED_DEADLINE is not set
1716 # CONFIG_IOSCHED_CFQ is not set
arch/m68k/configs/stmark2_defconfig+0−1
@@ -17,7 +17,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y · 16 unmodified lines
1717 CONFIG_EMBEDDED=y
1818 # CONFIG_VM_EVENT_COUNTERS is not set
1919 # CONFIG_COMPAT_BRK is not set
20−# CONFIG_LBDAF is not set
2120 # CONFIG_BLK_DEV_BSG is not set
2221 CONFIG_BLK_CMDLINE_PARSER=y
2322 # CONFIG_MMU is not set
arch/mips/configs/ar7_defconfig+0−1
@@ -18,7 +18,6 @@ CONFIG_KEXEC=y · 17 unmodified lines
1818 # CONFIG_SECCOMP is not set
1919 CONFIG_MODULES=y
2020 CONFIG_MODULE_UNLOAD=y
21−# CONFIG_LBDAF is not set
2221 # CONFIG_BLK_DEV_BSG is not set
2322 CONFIG_PARTITION_ADVANCED=y
2423 CONFIG_BSD_DISKLABEL=y
arch/mips/configs/decstation_defconfig+0−1
@@ -17,7 +17,6 @@ CONFIG_TC=y · 16 unmodified lines
1717 CONFIG_MODULES=y
1818 CONFIG_MODULE_UNLOAD=y
1919 CONFIG_MODULE_SRCVERSION_ALL=y
20−# CONFIG_LBDAF is not set
2120 CONFIG_PARTITION_ADVANCED=y
2221 CONFIG_OSF_PARTITION=y
2322 # CONFIG_EFI_PARTITION is not set
arch/mips/configs/decstation_r4k_defconfig+0−1
@@ -16,7 +16,6 @@ CONFIG_TC=y · 15 unmodified lines
1616 CONFIG_MODULES=y
1717 CONFIG_MODULE_UNLOAD=y
1818 CONFIG_MODULE_SRCVERSION_ALL=y
19−# CONFIG_LBDAF is not set
2019 CONFIG_PARTITION_ADVANCED=y
2120 CONFIG_OSF_PARTITION=y
2221 # CONFIG_EFI_PARTITION is not set
arch/mips/configs/loongson1b_defconfig+0−1
@@ -19,7 +19,6 @@ CONFIG_MACH_LOONGSON32=y · 18 unmodified lines
1919 CONFIG_MODULES=y
2020 CONFIG_MODULE_UNLOAD=y
2121 CONFIG_MODVERSIONS=y
22−# CONFIG_LBDAF is not set
2322 # CONFIG_BLK_DEV_BSG is not set
2423 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
2524 CONFIG_NET=y
arch/mips/configs/loongson1c_defconfig+0−1
@@ -20,7 +20,6 @@ CONFIG_LOONGSON1_LS1C=y · 19 unmodified lines
2020 CONFIG_MODULES=y
2121 CONFIG_MODULE_UNLOAD=y
2222 CONFIG_MODVERSIONS=y
23−# CONFIG_LBDAF is not set
2423 # CONFIG_BLK_DEV_BSG is not set
2524 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
2625 CONFIG_NET=y
arch/mips/configs/rb532_defconfig+0−1
@@ -19,7 +19,6 @@ CONFIG_PCI=y · 18 unmodified lines
1919 # CONFIG_PCI_QUIRKS is not set
2020 CONFIG_MODULES=y
2121 CONFIG_MODULE_UNLOAD=y
22−# CONFIG_LBDAF is not set
2322 # CONFIG_BLK_DEV_BSG is not set
2423 CONFIG_PARTITION_ADVANCED=y
2524 CONFIG_MAC_PARTITION=y
arch/mips/configs/rbtx49xx_defconfig+0−1
@@ -17,7 +17,6 @@ CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP=y · 16 unmodified lines
1717 CONFIG_PCI=y
1818 CONFIG_MODULES=y
1919 CONFIG_MODULE_UNLOAD=y
20−# CONFIG_LBDAF is not set
2120 # CONFIG_BLK_DEV_BSG is not set
2221 CONFIG_NET=y
2322 CONFIG_PACKET=y
arch/parisc/configs/generic-32bit_defconfig+0−1
@@ -14,7 +14,6 @@ CONFIG_SLAB=y · 13 unmodified lines
1414 CONFIG_MODULES=y
1515 CONFIG_MODULE_UNLOAD=y
1616 CONFIG_MODULE_FORCE_UNLOAD=y
17−# CONFIG_LBDAF is not set
1817 # CONFIG_BLK_DEV_BSG is not set
1918 CONFIG_PA7100LC=y
2019 CONFIG_SMP=y
arch/sh/configs/apsh4ad0a_defconfig+0−1
@@ -19,7 +19,6 @@ CONFIG_SLAB=y · 18 unmodified lines
1919 CONFIG_PROFILING=y
2020 CONFIG_MODULES=y
2121 CONFIG_MODULE_UNLOAD=y
22−# CONFIG_LBDAF is not set
2322 # CONFIG_BLK_DEV_BSG is not set
2423 CONFIG_CFQ_GROUP_IOSCHED=y
2524 CONFIG_CPU_SUBTYPE_SH7786=y
arch/sh/configs/ecovec24-romimage_defconfig+0−1
@@ -7,7 +7,6 @@ CONFIG_LOG_BUF_SHIFT=14 · 6 unmodified lines
77 CONFIG_BLK_DEV_INITRD=y
88 # CONFIG_KALLSYMS is not set
99 CONFIG_SLAB=y
10−# CONFIG_LBDAF is not set
1110 # CONFIG_BLK_DEV_BSG is not set
1211 CONFIG_CPU_SUBTYPE_SH7724=y
1312 CONFIG_MEMORY_SIZE=0x10000000
arch/sh/configs/rsk7264_defconfig+0−1
@@ -16,7 +16,6 @@ CONFIG_PERF_COUNTERS=y · 15 unmodified lines
1616 CONFIG_SLAB=y
1717 CONFIG_MMAP_ALLOW_UNINITIALIZED=y
1818 CONFIG_PROFILING=y
19−# CONFIG_LBDAF is not set
2019 # CONFIG_BLK_DEV_BSG is not set
2120 CONFIG_PARTITION_ADVANCED=y
2221 # CONFIG_IOSCHED_DEADLINE is not set
arch/sh/configs/rsk7269_defconfig+0−1
@@ -3,7 +3,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y · 2 unmodified lines
33 CONFIG_EMBEDDED=y
44 # CONFIG_VM_EVENT_COUNTERS is not set
55 CONFIG_SLAB=y
6−# CONFIG_LBDAF is not set
76 # CONFIG_BLK_DEV_BSG is not set
87 # CONFIG_IOSCHED_DEADLINE is not set
98 # CONFIG_IOSCHED_CFQ is not set
arch/sh/configs/sh7785lcr_32bit_defconfig+0−1
@@ -11,7 +11,6 @@ CONFIG_PROFILING=y · 10 unmodified lines
1111 CONFIG_GCOV_KERNEL=y
1212 CONFIG_MODULES=y
1313 CONFIG_MODULE_UNLOAD=y
14−# CONFIG_LBDAF is not set
1514 # CONFIG_BLK_DEV_BSG is not set
1615 CONFIG_CPU_SUBTYPE_SH7785=y
1716 CONFIG_MEMORY_START=0x40000000
block/Kconfig+0−24
@@ -26,30 +26,6 @@ menuconfig BLOCK · 25 unmodified lines
2626
2727 if BLOCK
2828
29−config LBDAF
30− bool "Support for large (2TB+) block devices and files"
31− depends on !64BIT
32− default y
33− help
34− Enable block devices or files of size 2TB and larger.
35−
36− This option is required to support the full capacity of large
37− (2TB+) block devices, including RAID, disk, Network Block Device,
38− Logical Volume Manager (LVM) and loopback.
39−
40− This option also enables support for single files larger than
41− 2TB.
42−
43− The ext4 filesystem requires that this feature be enabled in
44− order to support filesystems that have the huge_file feature
45− enabled. Otherwise, it will refuse to mount in the read-write
46− mode any filesystems that use the huge_file feature, which is
47− enabled by default by mke2fs.ext4.
48−
49− The GFS2 filesystem also requires this feature.
50−
51− If unsure, say Y.
52−
5329 config BLK_SCSI_REQUEST
5430 bool
5531
drivers/block/drbd/drbd_int.h+0−5
@@ -1317,10 +1317,6 @@ struct bm_extent { · 1316 unmodified lines
13171317
13181318 #define DRBD_MAX_SECTORS_FIXED_BM \
13191319 ((MD_128MB_SECT - MD_32kB_SECT - MD_4kB_SECT) * (1LL<<(BM_EXT_SHIFT-9)))
1320−#if !defined(CONFIG_LBDAF) && BITS_PER_LONG == 32
1321−#define DRBD_MAX_SECTORS DRBD_MAX_SECTORS_32
1322−#define DRBD_MAX_SECTORS_FLEX DRBD_MAX_SECTORS_32
1323−#else
13241320 #define DRBD_MAX_SECTORS DRBD_MAX_SECTORS_FIXED_BM
13251321 /* 16 TB in units of sectors */
13261322 #if BITS_PER_LONG == 32
@@ -1333,7 +1329,6 @@ struct bm_extent { · 6 unmodified lines
13331329 #define DRBD_MAX_SECTORS_FLEX (1UL << 51)
13341330 /* corresponds to (1UL << 38) bits right now. */
13351331 #endif
1336−#endif
13371332
13381333 /* Estimate max bio size as 256 * PAGE_SIZE,
13391334 * so for typical PAGE_SIZE of 4k, that is (1<<20) Byte.
drivers/block/ps3disk.c+2−2
@@ -102,7 +102,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, · 101 unmodified lines
102102
103103 rq_for_each_segment(bvec, req, iter) {
104104 unsigned long flags;
105− dev_dbg(&dev->sbd.core, "%s:%u: bio %u: %u sectors from %lu\n",
105+ dev_dbg(&dev->sbd.core, "%s:%u: bio %u: %u sectors from %llu\n",
106106 __func__, __LINE__, i, bio_sectors(iter.bio),
107107 iter.bio->bi_iter.bi_sector);
108108
@@ -496,7 +496,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) · 387 unmodified lines
496496 dev->regions[dev->region_idx].size*priv->blocking_factor);
497497
498498 dev_info(&dev->sbd.core,
499− "%s is a %s (%llu MiB total, %lu MiB for OtherOS)\n",
499+ "%s is a %s (%llu MiB total, %llu MiB for OtherOS)\n",
500500 gendisk->disk_name, priv->model, priv->raw_capacity >> 11,
501501 get_capacity(gendisk) >> 11);
502502
drivers/md/dm-exception-store.h+2−26
@@ -135,9 +135,8 @@ struct dm_dev *dm_snap_cow(struct dm_snapshot *snap); · 134 unmodified lines
135135 /*
136136 * Funtions to manipulate consecutive chunks
137137 */
138−# if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64)
139−# define DM_CHUNK_CONSECUTIVE_BITS 8
140−# define DM_CHUNK_NUMBER_BITS 56
138+#define DM_CHUNK_CONSECUTIVE_BITS 8
139+#define DM_CHUNK_NUMBER_BITS 56
141140
142141 static inline chunk_t dm_chunk_number(chunk_t chunk)
143142 {
@@ -163,29 +162,6 @@ static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e) · 19 unmodified lines
163162 e->new_chunk -= (1ULL << DM_CHUNK_NUMBER_BITS);
164163 }
165164
166−# else
167−# define DM_CHUNK_CONSECUTIVE_BITS 0
168−
169−static inline chunk_t dm_chunk_number(chunk_t chunk)
170−{
171− return chunk;
172−}
173−
174−static inline unsigned dm_consecutive_chunk_count(struct dm_exception *e)
175−{
176− return 0;
177−}
178−
179−static inline void dm_consecutive_chunk_count_inc(struct dm_exception *e)
180−{
181−}
182−
183−static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e)
184−{
185−}
186−
187−# endif
188−
189165 /*
190166 * Return the number of sectors in the device.
191167 */
drivers/md/dm-integrity.c+2−6
@@ -88,14 +88,10 @@ struct journal_entry { · 87 unmodified lines
8888
8989 #if BITS_PER_LONG == 64
9090 #define journal_entry_set_sector(je, x) do { smp_wmb(); WRITE_ONCE((je)->u.sector, cpu_to_le64(x)); } while (0)
91−#define journal_entry_get_sector(je) le64_to_cpu((je)->u.sector)
92−#elif defined(CONFIG_LBDAF)
93−#define journal_entry_set_sector(je, x) do { (je)->u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)->u.s.sector_hi, cpu_to_le32((x) >> 32)); } while (0)
94−#define journal_entry_get_sector(je) le64_to_cpu((je)->u.sector)
9591 #else
96−#define journal_entry_set_sector(je, x) do { (je)->u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)->u.s.sector_hi, cpu_to_le32(0)); } while (0)
97−#define journal_entry_get_sector(je) le32_to_cpu((je)->u.s.sector_lo)
92+#define journal_entry_set_sector(je, x) do { (je)->u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)->u.s.sector_hi, cpu_to_le32((x) >> 32)); } while (0)
9893 #endif
94+#define journal_entry_get_sector(je) le64_to_cpu((je)->u.sector)
9995 #define journal_entry_is_unused(je) ((je)->u.s.sector_hi == cpu_to_le32(-1))
10096 #define journal_entry_set_unused(je) do { ((je)->u.s.sector_hi = cpu_to_le32(-1)); } while (0)
10197 #define journal_entry_is_inprogress(je) ((je)->u.s.sector_hi == cpu_to_le32(-2))
drivers/md/md.c+2−4
@@ -1106,8 +1106,7 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor · 1105 unmodified lines
11061106 * (not needed for Linear and RAID0 as metadata doesn't
11071107 * record this size)
11081108 */
1109− if (IS_ENABLED(CONFIG_LBDAF) && (u64)rdev->sectors >= (2ULL << 32) &&
1110− sb->level >= 1)
1109+ if ((u64)rdev->sectors >= (2ULL << 32) && sb->level >= 1)
11111110 rdev->sectors = (sector_t)(2ULL << 32) - 2;
11121111
11131112 if (rdev->sectors < ((sector_t)sb->size) * 2 && sb->level >= 1)
@@ -1405,8 +1404,7 @@ super_90_rdev_size_change(struct md_rdev *rdev, sector_t num_sectors) · 291 unmodified lines
14051404 /* Limit to 4TB as metadata cannot record more than that.
14061405 * 4TB == 2^32 KB, or 2*2^32 sectors.
14071406 */
1408− if (IS_ENABLED(CONFIG_LBDAF) && (u64)num_sectors >= (2ULL << 32) &&
1409− rdev->mddev->level >= 1)
1407+ if ((u64)num_sectors >= (2ULL << 32) && rdev->mddev->level >= 1)
14101408 num_sectors = (sector_t)(2ULL << 32) - 2;
14111409 do {
14121410 md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size,
drivers/nvdimm/pfn_devs.c+2−2
@@ -391,7 +391,7 @@ static int nd_pfn_clear_memmap_errors(struct nd_pfn *nd_pfn) · 390 unmodified lines
391391 bb_present = badblocks_check(&nd_region->bb, meta_start,
392392 meta_num, &first_bad, &num_bad);
393393 if (bb_present) {
394− dev_dbg(&nd_pfn->dev, "meta: %x badblocks at %lx\n",
394+ dev_dbg(&nd_pfn->dev, "meta: %x badblocks at %llx\n",
395395 num_bad, first_bad);
396396 nsoff = ALIGN_DOWN((nd_region->ndr_start
397397 + (first_bad << 9)) - nsio->res.start,
@@ -410,7 +410,7 @@ static int nd_pfn_clear_memmap_errors(struct nd_pfn *nd_pfn) · 12 unmodified lines
410410 }
411411 if (rc) {
412412 dev_err(&nd_pfn->dev,
413− "error clearing %x badblocks at %lx\n",
413+ "error clearing %x badblocks at %llx\n",
414414 num_bad, first_bad);
415415 return rc;
416416 }
drivers/scsi/sd.c+0−32
@@ -2256,22 +2256,6 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp, · 2255 unmodified lines
22562256
22572257 #define READ_CAPACITY_RETRIES_ON_RESET 10
22582258
2259−/*
2260− * Ensure that we don't overflow sector_t when CONFIG_LBDAF is not set
2261− * and the reported logical block size is bigger than 512 bytes. Note
2262− * that last_sector is a u64 and therefore logical_to_sectors() is not
2263− * applicable.
2264− */
2265−static bool sd_addressable_capacity(u64 lba, unsigned int sector_size)
2266−{
2267− u64 last_sector = (lba + 1ULL) << (ilog2(sector_size) - 9);
2268−
2269− if (sizeof(sector_t) == 4 && last_sector > U32_MAX)
2270− return false;
2271−
2272− return true;
2273−}
2274−
22752259 static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
22762260 unsigned char *buffer)
22772261 {
@@ -2337,14 +2321,6 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, · 59 unmodified lines
23372321 return -ENODEV;
23382322 }
23392323
2340− if (!sd_addressable_capacity(lba, sector_size)) {
2341− sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "
2342− "kernel compiled with support for large block "
2343− "devices.\n");
2344− sdkp->capacity = 0;
2345− return -EOVERFLOW;
2346− }
2347−
23482324 /* Logical blocks per physical block exponent */
23492325 sdkp->physical_block_size = (1 << (buffer[13] & 0xf)) * sector_size;
23502326
@@ -2426,14 +2402,6 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, · 75 unmodified lines
24262402 return sector_size;
24272403 }
24282404
2429− if (!sd_addressable_capacity(lba, sector_size)) {
2430− sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "
2431− "kernel compiled with support for large block "
2432− "devices.\n");
2433− sdkp->capacity = 0;
2434− return -EOVERFLOW;
2435− }
2436−
24372405 sdkp->capacity = lba + 1;
24382406 sdkp->physical_block_size = sector_size;
24392407 return sector_size;
fs/ext4/resize.c+0−2
@@ -1760,8 +1760,6 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, · 1759 unmodified lines
17601760 ext4_msg(sb, KERN_ERR,
17611761 "filesystem too large to resize to %llu blocks safely",
17621762 n_blocks_count);
1763− if (sizeof(sector_t) < 8)
1764− ext4_warning(sb, "CONFIG_LBDAF not enabled");
17651763 return -EINVAL;
17661764 }
17671765
fs/ext4/super.c+7−25
@@ -2706,13 +2706,9 @@ static loff_t ext4_max_size(int blkbits, int has_huge_files) · 2705 unmodified lines
27062706 loff_t res;
27072707 loff_t upper_limit = MAX_LFS_FILESIZE;
27082708
2709− /* small i_blocks in vfs inode? */
2710− if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) {
2711− /*
2712− * CONFIG_LBDAF is not enabled implies the inode
2713− * i_block represent total blocks in 512 bytes
2714− * 32 == size of vfs inode i_blocks * 8
2715− */
2709+ BUILD_BUG_ON(sizeof(blkcnt_t) < sizeof(u64));
2710+
2711+ if (!has_huge_files) {
27162712 upper_limit = (1LL << 32) - 1;
27172713
27182714 /* total blocks in file system block size */
@@ -2753,11 +2749,11 @@ static loff_t ext4_max_bitmap_size(int bits, int has_huge_files) · 34 unmodified lines
27532749 * number of 512-byte sectors of the file.
27542750 */
27552751
2756− if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) {
2752+ if (!has_huge_files) {
27572753 /*
2758− * !has_huge_files or CONFIG_LBDAF not enabled implies that
2759− * the inode i_block field represents total file blocks in
2760− * 2^32 512-byte sectors == size of vfs inode i_blocks * 8
2754+ * !has_huge_files or implies that the inode i_block field
2755+ * represents total file blocks in 2^32 512-byte sectors ==
2756+ * size of vfs inode i_blocks * 8
27612757 */
27622758 upper_limit = (1LL << 32) - 1;
27632759
@@ -2897,18 +2893,6 @@ static int ext4_feature_set_ok(struct super_block *sb, int readonly) · 133 unmodified lines
28972893 ~EXT4_FEATURE_RO_COMPAT_SUPP));
28982894 return 0;
28992895 }
2900− /*
2901− * Large file size enabled file system can only be mounted
2902− * read-write on 32-bit systems if kernel is built with CONFIG_LBDAF
2903− */
2904− if (ext4_has_feature_huge_file(sb)) {
2905− if (sizeof(blkcnt_t) < sizeof(u64)) {
2906− ext4_msg(sb, KERN_ERR, "Filesystem with huge files "
2907− "cannot be mounted RDWR without "
2908− "CONFIG_LBDAF");
2909− return 0;
2910− }
2911− }
29122896 if (ext4_has_feature_bigalloc(sb) && !ext4_has_feature_extents(sb)) {
29132897 ext4_msg(sb, KERN_ERR,
29142898 "Can't support bigalloc feature without "
@@ -4057,8 +4041,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) · 1142 unmodified lines
40574041 if (err) {
40584042 ext4_msg(sb, KERN_ERR, "filesystem"
40594043 " too large to mount safely on this system");
4060− if (sizeof(sector_t) < 8)
4061− ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled");
40624044 goto failed_mount;
40634045 }
40644046
fs/gfs2/Kconfig+0−1
@@ -1,6 +1,5 @@
11 config GFS2_FS
22 tristate "GFS2 file system support"
3− depends on (64BIT || LBDAF)
43 select FS_POSIX_ACL
54 select CRC32
65 select LIBCRC32C
fs/nfs/Kconfig+0−1
@@ -121,7 +121,6 @@ config PNFS_FILE_LAYOUT · 120 unmodified lines
121121 config PNFS_BLOCK
122122 tristate
123123 depends on NFS_V4_1 && BLK_DEV_DM
124− depends on 64BIT || LBDAF
125124 default NFS_V4
126125
127126 config PNFS_FLEXFILE_LAYOUT
fs/ocfs2/super.c+0−10
@@ -600,7 +600,6 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits, · 599 unmodified lines
600600 */
601601
602602 #if BITS_PER_LONG == 32
603−# if defined(CONFIG_LBDAF)
604603 BUILD_BUG_ON(sizeof(sector_t) != 8);
605604 /*
606605 * We might be limited by page cache size.
@@ -614,15 +613,6 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits, · 7 unmodified lines
614613 */
615614 bitshift = 31;
616615 }
617−# else
618− /*
619− * We are limited by the size of sector_t. Use block size, as
620− * that's what we expose to the VFS.
621− */
622− bytes = 1 << bbits;
623− trim = 1;
624− bitshift = 31;
625−# endif
626616 #endif
627617
628618 /*
fs/stack.c+7−8
@@ -21,11 +21,10 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src) · 20 unmodified lines
2121 i_size = i_size_read(src);
2222
2323 /*
24− * But if CONFIG_LBDAF (on 32-bit), we ought to make an effort to
25− * keep the two halves of i_blocks in sync despite SMP or PREEMPT -
26− * though stat's generic_fillattr() doesn't bother, and we won't be
27− * applying quotas (where i_blocks does become important) at the
28− * upper level.
24+ * But on 32-bit, we ought to make an effort to keep the two halves of
25+ * i_blocks in sync despite SMP or PREEMPT - though stat's
26+ * generic_fillattr() doesn't bother, and we won't be applying quotas
27+ * (where i_blocks does become important) at the upper level.
2928 *
3029 * We don't actually know what locking is used at the lower level;
3130 * but if it's a filesystem that supports quotas, it will be using
@@ -44,9 +43,9 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src) · 12 unmodified lines
4443 * include/linux/fs.h). We don't necessarily hold i_mutex when this
4544 * is called, so take i_lock for that case.
4645 *
47− * And if CONFIG_LBDAF (on 32-bit), continue our effort to keep the
48− * two halves of i_blocks in sync despite SMP or PREEMPT: use i_lock
49− * for that case too, and do both at once by combining the tests.
46+ * And if on 32-bit, continue our effort to keep the two halves of
47+ * i_blocks in sync despite SMP or PREEMPT: use i_lock for that case
48+ * too, and do both at once by combining the tests.
5049 *
5150 * There is none of this locking overhead in the 64-bit case.
5251 */
fs/xfs/Kconfig+0−1
@@ -1,7 +1,6 @@
11 config XFS_FS
22 tristate "XFS filesystem support"
33 depends on BLOCK
4− depends on (64BIT || LBDAF)
54 select EXPORTFS
65 select LIBCRC32C
76 select FS_IOMAP
fs/xfs/xfs_super.c+1−9
@@ -539,26 +539,18 @@ xfs_max_file_offset( · 538 unmodified lines
539539
540540 /* Figure out maximum filesize, on Linux this can depend on
541541 * the filesystem blocksize (on 32 bit platforms).
542− * __block_write_begin does this in an [unsigned] long...
542+ * __block_write_begin does this in an [unsigned] long long...
543543 * page->index << (PAGE_SHIFT - bbits)
544544 * So, for page sized blocks (4K on 32 bit platforms),
545545 * this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is
546546 * (((u64)PAGE_SIZE << (BITS_PER_LONG-1))-1)
547547 * but for smaller blocksizes it is less (bbits = log2 bsize).
548− * Note1: get_block_t takes a long (implicit cast from above)
549− * Note2: The Large Block Device (LBD and HAVE_SECTOR_T) patch
550− * can optionally convert the [unsigned] long from above into
551− * an [unsigned] long long.
552548 */
553549
554550 #if BITS_PER_LONG == 32
555−# if defined(CONFIG_LBDAF)
556551 ASSERT(sizeof(sector_t) == 8);
557552 pagefactor = PAGE_SIZE;
558553 bitshift = BITS_PER_LONG;
559−# else
560− pagefactor = PAGE_SIZE >> (PAGE_SHIFT - blockshift);
561−# endif
562554 #endif
563555
564556 return (((uint64_t)pagefactor) << bitshift) - 1;
include/linux/genhd.h+4−4
@@ -714,7 +714,7 @@ static inline void hd_free_part(struct hd_struct *part) · 713 unmodified lines
714714 */
715715 static inline sector_t part_nr_sects_read(struct hd_struct *part)
716716 {
717−#if BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_SMP)
717+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
718718 sector_t nr_sects;
719719 unsigned seq;
720720 do {
@@ -722,7 +722,7 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part) · 1 unmodified line
722722 nr_sects = part->nr_sects;
723723 } while (read_seqcount_retry(&part->nr_sects_seq, seq));
724724 return nr_sects;
725−#elif BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_PREEMPT)
725+#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT)
726726 sector_t nr_sects;
727727
728728 preempt_disable();
@@ -741,11 +741,11 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part) · 12 unmodified lines
741741 */
742742 static inline void part_nr_sects_write(struct hd_struct *part, sector_t size)
743743 {
744−#if BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_SMP)
744+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
745745 write_seqcount_begin(&part->nr_sects_seq);
746746 part->nr_sects = size;
747747 write_seqcount_end(&part->nr_sects_seq);
748−#elif BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_PREEMPT)
748+#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT)
749749 preempt_disable();
750750 part->nr_sects = size;
751751 preempt_enable();
include/linux/kernel.h+2−12
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717 #include <asm/byteorder.h>
1818 #include <asm/div64.h>
1919 #include <uapi/linux/kernel.h>
20+#include <asm/div64.h>
2021
2122 #define STACK_MAGIC 0xdeadbeef
2223
@@ -175,18 +176,7 @@ · 152 unmodified lines
175176 #define _RET_IP_ (unsigned long)__builtin_return_address(0)
176177 #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
177178
178−#ifdef CONFIG_LBDAF
179−# define sector_div(a, b) do_div(a, b)
180−#else
181−# define sector_div(n, b)( \
182−{ \
183− int _res; \
184− _res = (n) % (b); \
185− (n) /= (b); \
186− _res; \
187−} \
188−)
189−#endif
179+#define sector_div(a, b) do_div(a, b)
190180
191181 /**
192182 * upper_32_bits - return bits 32-63 of a number
include/linux/types.h+0−5
@@ -127,13 +127,8 @@ typedef s64 int64_t; · 126 unmodified lines
127127 *
128128 * blkcnt_t is the type of the inode's block count.
129129 */
130−#ifdef CONFIG_LBDAF
131130 typedef u64 sector_t;
132131 typedef u64 blkcnt_t;
133−#else
134−typedef unsigned long sector_t;
135−typedef unsigned long blkcnt_t;
136−#endif
137132
138133 /*
139134 * The type of an index into the pagecache.
lib/Kconfig.debug+0−1
@@ -1927,7 +1927,6 @@ config TEST_STATIC_KEYS · 1926 unmodified lines
19271927 config TEST_KMOD
19281928 tristate "kmod stress tester"
19291929 depends on m
1930− depends on BLOCK && (64BIT || LBDAF) # for XFS, BTRFS
19311930 depends on NETDEVICES && NET_CORE && INET # for TUN
19321931 select TEST_LKM
19331932 select XFS_FS
tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h+0−4
@@ -59,11 +59,7 @@ typedef __u32 uint32_t; · 58 unmodified lines
5959 *
6060 * blkcnt_t is the type of the inode's block count.
6161 */
62−#ifdef CONFIG_LBDAF
6362 typedef u64 sector_t;
64−#else
65−typedef unsigned long sector_t;
66−#endif
6763
6864 /*
6965 * The type of an index into the pagecache.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t