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.
Unified · Split
| @@ -72,47 +72,44 @@ and elsewhere regarding submitting Linux kernel patches. · 71 unmodified lines | ||
| 72 | 72 | 13) Has been build- and runtime tested with and without ``CONFIG_SMP`` and |
| 73 | 73 | ``CONFIG_PREEMPT.`` |
| 74 | 74 | |
| 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. | |
| 77 | 76 | |
| 78 | −15) All codepaths have been exercised with all lockdep features enabled. | |
| 77 | +17) All new ``/proc`` entries are documented under ``Documentation/`` | |
| 79 | 78 | |
| 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 | |
| 83 | 80 | ``Documentation/admin-guide/kernel-parameters.rst``. |
| 84 | 81 | |
| 85 | −18) All new module parameters are documented with ``MODULE_PARM_DESC()`` | |
| 82 | +19) All new module parameters are documented with ``MODULE_PARM_DESC()`` | |
| 86 | 83 | |
| 87 | −19) All new userspace interfaces are documented in ``Documentation/ABI/``. | |
| 84 | +20) All new userspace interfaces are documented in ``Documentation/ABI/``. | |
| 88 | 85 | See ``Documentation/ABI/README`` for more information. |
| 89 | 86 | Patches that change userspace interfaces should be CCed to |
| 90 | 87 | linux-api@vger.kernel.org. |
| 91 | 88 | |
| 92 | −20) Check that it all passes ``make headers_check``. | |
| 89 | +21) Check that it all passes ``make headers_check``. | |
| 93 | 90 | |
| 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 | |
| 95 | 92 | failures. See ``Documentation/fault-injection/``. |
| 96 | 93 | |
| 97 | 94 | If the new code is substantial, addition of subsystem-specific fault |
| 98 | 95 | injection might be appropriate. |
| 99 | 96 | |
| 100 | −22) Newly-added code has been compiled with ``gcc -W`` (use | |
| 97 | +23) Newly-added code has been compiled with ``gcc -W`` (use | |
| 101 | 98 | ``make EXTRA_CFLAGS=-W``). This will generate lots of noise, but is good |
| 102 | 99 | for finding bugs like "warning: comparison between signed and unsigned". |
| 103 | 100 | |
| 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 | |
| 105 | 102 | that it still works with all of the other queued patches and various |
| 106 | 103 | changes in the VM, VFS, and other subsystems. |
| 107 | 104 | |
| 108 | −24) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a | |
| 105 | +25) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a | |
| 109 | 106 | comment in the source code that explains the logic of what they are doing |
| 110 | 107 | and why. |
| 111 | 108 | |
| 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 | |
| 113 | 110 | ``Documentation/ioctl/ioctl-number.txt``. |
| 114 | 111 | |
| 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 | |
| 116 | 113 | APIs or features that are related to the following ``Kconfig`` symbols, |
| 117 | 114 | then test multiple builds with the related ``Kconfig`` symbols disabled |
| 118 | 115 | and/or ``=m`` (if that option is available) [not all of these at the |
| @@ -74,38 +74,34 @@ Linux カーネルパッチ投稿者向けチェックリスト · 73 unmodified lines | ||
| 74 | 74 | 13: CONFIG_SMP, CONFIG_PREEMPT を有効にした場合と無効にした場合の両方で |
| 75 | 75 | ビルドした上、動作確認を行ってください。 |
| 76 | 76 | |
| 77 | −14: もしパッチがディスクのI/O性能などに影響を与えるようであれば、 | |
| 78 | − 'CONFIG_LBDAF'オプションを有効にした場合と無効にした場合の両方で | |
| 79 | − テストを実施してみてください。 | |
| 77 | +14: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。 | |
| 80 | 78 | |
| 81 | −15: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。 | |
| 82 | − | |
| 83 | −16: /proc に新しいエントリを追加した場合には、Documentation/ 配下に | |
| 79 | +15: /proc に新しいエントリを追加した場合には、Documentation/ 配下に | |
| 84 | 80 | 必ずドキュメントを追加してください。 |
| 85 | 81 | |
| 86 | −17: 新しいブートパラメータを追加した場合には、 | |
| 82 | +16: 新しいブートパラメータを追加した場合には、 | |
| 87 | 83 | 必ずDocumentation/admin-guide/kernel-parameters.rst に説明を追加してください。 |
| 88 | 84 | |
| 89 | −18: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を | |
| 85 | +17: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を | |
| 90 | 86 | 利用して必ずその説明を記述してください。 |
| 91 | 87 | |
| 92 | −19: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に | |
| 88 | +18: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に | |
| 93 | 89 | Documentation/ABI/README を参考にして必ずドキュメントを追加してください。 |
| 94 | 90 | |
| 95 | −20: 'make headers_check'を実行して全く問題がないことを確認してください。 | |
| 91 | +19: 'make headers_check'を実行して全く問題がないことを確認してください。 | |
| 96 | 92 | |
| 97 | −21: 少なくともslabアロケーションとpageアロケーションに失敗した場合の | |
| 93 | +20: 少なくともslabアロケーションとpageアロケーションに失敗した場合の | |
| 98 | 94 | 挙動について、fault-injectionを利用して確認してください。 |
| 99 | 95 | Documentation/fault-injection/ を参照してください。 |
| 100 | 96 | |
| 101 | 97 | 追加したコードがかなりの量であったならば、サブシステム特有の |
| 102 | 98 | fault-injectionを追加したほうが良いかもしれません。 |
| 103 | 99 | |
| 104 | −22: 新たに追加したコードは、`gcc -W'でコンパイルしてください。 | |
| 100 | +21: 新たに追加したコードは、`gcc -W'でコンパイルしてください。 | |
| 105 | 101 | このオプションは大量の不要なメッセージを出力しますが、 |
| 106 | 102 | "warning: comparison between signed and unsigned" のようなメッセージは、 |
| 107 | 103 | バグを見つけるのに役に立ちます。 |
| 108 | 104 | |
| 109 | −23: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや | |
| 105 | +22: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや | |
| 110 | 106 | VM, VFS およびその他のサブシステムに関する様々な変更と、現時点でも共存 |
| 111 | 107 | できることを確認するテストを行ってください。 |
| @@ -15,7 +15,6 @@ CONFIG_PERF_EVENTS=y · 14 unmodified lines | ||
| 15 | 15 | # CONFIG_COMPAT_BRK is not set |
| 16 | 16 | CONFIG_SLAB=y |
| 17 | 17 | CONFIG_MODULES=y |
| 18 | −# CONFIG_LBDAF is not set | |
| 19 | 18 | # CONFIG_BLK_DEV_BSG is not set |
| 20 | 19 | # CONFIG_IOSCHED_DEADLINE is not set |
| 21 | 20 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -17,7 +17,6 @@ CONFIG_PERF_EVENTS=y · 16 unmodified lines | ||
| 17 | 17 | CONFIG_SLAB=y |
| 18 | 18 | CONFIG_KPROBES=y |
| 19 | 19 | CONFIG_MODULES=y |
| 20 | −# CONFIG_LBDAF is not set | |
| 21 | 20 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | 21 | # CONFIG_IOSCHED_DEADLINE is not set |
| 23 | 22 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -18,7 +18,6 @@ CONFIG_PERF_EVENTS=y · 17 unmodified lines | ||
| 18 | 18 | CONFIG_ISA_ARCOMPACT=y |
| 19 | 19 | CONFIG_KPROBES=y |
| 20 | 20 | CONFIG_MODULES=y |
| 21 | −# CONFIG_LBDAF is not set | |
| 22 | 21 | # CONFIG_BLK_DEV_BSG is not set |
| 23 | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
| 24 | 23 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -20,7 +20,6 @@ CONFIG_MODULES=y · 19 unmodified lines | ||
| 20 | 20 | CONFIG_MODULE_FORCE_LOAD=y |
| 21 | 21 | CONFIG_MODULE_UNLOAD=y |
| 22 | 22 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 23 | −# CONFIG_LBDAF is not set | |
| 24 | 23 | # CONFIG_BLK_DEV_BSG is not set |
| 25 | 24 | # CONFIG_IOSCHED_DEADLINE is not set |
| 26 | 25 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -18,7 +18,6 @@ CONFIG_MODULES=y · 17 unmodified lines | ||
| 18 | 18 | CONFIG_MODULE_FORCE_LOAD=y |
| 19 | 19 | CONFIG_MODULE_UNLOAD=y |
| 20 | 20 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 21 | −# CONFIG_LBDAF is not set | |
| 22 | 21 | # CONFIG_BLK_DEV_BSG is not set |
| 23 | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
| 24 | 23 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -18,7 +18,6 @@ CONFIG_PERF_EVENTS=y · 17 unmodified lines | ||
| 18 | 18 | CONFIG_ISA_ARCOMPACT=y |
| 19 | 19 | CONFIG_KPROBES=y |
| 20 | 20 | CONFIG_MODULES=y |
| 21 | −# CONFIG_LBDAF is not set | |
| 22 | 21 | # CONFIG_BLK_DEV_BSG is not set |
| 23 | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
| 24 | 23 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -17,7 +17,6 @@ CONFIG_PERF_EVENTS=y · 16 unmodified lines | ||
| 17 | 17 | # CONFIG_COMPAT_BRK is not set |
| 18 | 18 | CONFIG_KPROBES=y |
| 19 | 19 | CONFIG_MODULES=y |
| 20 | −# CONFIG_LBDAF is not set | |
| 21 | 20 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | 21 | # CONFIG_IOSCHED_DEADLINE is not set |
| 23 | 22 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -12,7 +12,6 @@ CONFIG_PERF_EVENTS=y · 11 unmodified lines | ||
| 12 | 12 | # CONFIG_COMPAT_BRK is not set |
| 13 | 13 | CONFIG_KPROBES=y |
| 14 | 14 | CONFIG_MODULES=y |
| 15 | −# CONFIG_LBDAF is not set | |
| 16 | 15 | # CONFIG_BLK_DEV_BSG is not set |
| 17 | 16 | # CONFIG_IOSCHED_DEADLINE is not set |
| 18 | 17 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -23,7 +23,6 @@ CONFIG_SLAB_FREELIST_RANDOM=y · 22 unmodified lines | ||
| 23 | 23 | CONFIG_JUMP_LABEL=y |
| 24 | 24 | CONFIG_STRICT_KERNEL_RWX=y |
| 25 | 25 | CONFIG_GCC_PLUGINS=y |
| 26 | −# CONFIG_LBDAF is not set | |
| 27 | 26 | # CONFIG_BLK_DEV_BSG is not set |
| 28 | 27 | # CONFIG_BLK_DEBUG_FS is not set |
| 29 | 28 | # CONFIG_IOSCHED_DEADLINE is not set |
| @@ -23,7 +23,6 @@ CONFIG_SLAB_FREELIST_RANDOM=y · 22 unmodified lines | ||
| 23 | 23 | CONFIG_JUMP_LABEL=y |
| 24 | 24 | CONFIG_STRICT_KERNEL_RWX=y |
| 25 | 25 | CONFIG_GCC_PLUGINS=y |
| 26 | −# CONFIG_LBDAF is not set | |
| 27 | 26 | # CONFIG_BLK_DEV_BSG is not set |
| 28 | 27 | # CONFIG_BLK_DEBUG_FS is not set |
| 29 | 28 | # CONFIG_IOSCHED_DEADLINE is not set |
| @@ -9,7 +9,6 @@ CONFIG_EMBEDDED=y · 8 unmodified lines | ||
| 9 | 9 | CONFIG_SLAB=y |
| 10 | 10 | CONFIG_MODULES=y |
| 11 | 11 | CONFIG_MODULE_UNLOAD=y |
| 12 | −# CONFIG_LBDAF is not set | |
| 13 | 12 | # CONFIG_BLK_DEV_BSG is not set |
| 14 | 13 | # CONFIG_IOSCHED_DEADLINE is not set |
| 15 | 14 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -6,7 +6,6 @@ CONFIG_RD_LZMA=y · 5 unmodified lines | ||
| 6 | 6 | CONFIG_EMBEDDED=y |
| 7 | 7 | CONFIG_SLOB=y |
| 8 | 8 | CONFIG_JUMP_LABEL=y |
| 9 | −# CONFIG_LBDAF is not set | |
| 10 | 9 | CONFIG_PARTITION_ADVANCED=y |
| 11 | 10 | # CONFIG_IOSCHED_CFQ is not set |
| 12 | 11 | CONFIG_ARCH_CLPS711X=y |
| @@ -11,7 +11,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y · 10 unmodified lines | ||
| 11 | 11 | CONFIG_EMBEDDED=y |
| 12 | 12 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 13 | 13 | # CONFIG_SLUB_DEBUG is not set |
| 14 | −# CONFIG_LBDAF is not set | |
| 15 | 14 | # CONFIG_BLK_DEV_BSG is not set |
| 16 | 15 | # CONFIG_IOSCHED_DEADLINE is not set |
| 17 | 16 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -13,7 +13,6 @@ CONFIG_MODULES=y · 12 unmodified lines | ||
| 13 | 13 | CONFIG_MODULE_UNLOAD=y |
| 14 | 14 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 15 | 15 | CONFIG_MODVERSIONS=y |
| 16 | −# CONFIG_LBDAF is not set | |
| 17 | 16 | # CONFIG_BLK_DEV_BSG is not set |
| 18 | 17 | # CONFIG_IOSCHED_CFQ is not set |
| 19 | 18 | CONFIG_ARCH_PXA=y |
| @@ -4,7 +4,6 @@ CONFIG_HIGH_RES_TIMERS=y · 3 unmodified lines | ||
| 4 | 4 | CONFIG_LOG_BUF_SHIFT=14 |
| 5 | 5 | CONFIG_BLK_DEV_INITRD=y |
| 6 | 6 | CONFIG_MODULES=y |
| 7 | −# CONFIG_LBDAF is not set | |
| 8 | 7 | # CONFIG_BLK_DEV_BSG is not set |
| 9 | 8 | # CONFIG_IOSCHED_DEADLINE is not set |
| 10 | 9 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -12,7 +12,6 @@ CONFIG_MODULES=y · 11 unmodified lines | ||
| 12 | 12 | CONFIG_MODULE_UNLOAD=y |
| 13 | 13 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 14 | 14 | CONFIG_MODVERSIONS=y |
| 15 | −# CONFIG_LBDAF is not set | |
| 16 | 15 | # CONFIG_BLK_DEV_BSG is not set |
| 17 | 16 | # CONFIG_IOSCHED_CFQ is not set |
| 18 | 17 | CONFIG_ARCH_PXA=y |
| @@ -15,7 +15,6 @@ CONFIG_EMBEDDED=y · 14 unmodified lines | ||
| 15 | 15 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 16 | 16 | # CONFIG_SLUB_DEBUG is not set |
| 17 | 17 | # CONFIG_COMPAT_BRK is not set |
| 18 | −# CONFIG_LBDAF is not set | |
| 19 | 18 | # CONFIG_BLK_DEV_BSG is not set |
| 20 | 19 | # CONFIG_IOSCHED_DEADLINE is not set |
| 21 | 20 | CONFIG_ARCH_MULTI_V4=y |
| @@ -5,7 +5,6 @@ CONFIG_BLK_DEV_INITRD=y · 4 unmodified lines | ||
| 5 | 5 | CONFIG_EMBEDDED=y |
| 6 | 6 | CONFIG_SLOB=y |
| 7 | 7 | CONFIG_JUMP_LABEL=y |
| 8 | −# CONFIG_LBDAF is not set | |
| 9 | 8 | CONFIG_PARTITION_ADVANCED=y |
| 10 | 9 | # CONFIG_IOSCHED_CFQ is not set |
| 11 | 10 | CONFIG_ARCH_MULTI_V4T=y |
| @@ -17,7 +17,6 @@ CONFIG_OPROFILE=y · 16 unmodified lines | ||
| 17 | 17 | CONFIG_MODULES=y |
| 18 | 18 | CONFIG_MODULE_UNLOAD=y |
| 19 | 19 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 20 | −# CONFIG_LBDAF is not set | |
| 21 | 20 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | 21 | # CONFIG_IOSCHED_DEADLINE is not set |
| 23 | 22 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -13,7 +13,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y · 12 unmodified lines | ||
| 13 | 13 | CONFIG_EMBEDDED=y |
| 14 | 14 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 15 | 15 | # CONFIG_SLUB_DEBUG is not set |
| 16 | −# CONFIG_LBDAF is not set | |
| 17 | 16 | # CONFIG_BLK_DEV_BSG is not set |
| 18 | 17 | # CONFIG_IOSCHED_DEADLINE is not set |
| 19 | 18 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -9,7 +9,6 @@ CONFIG_EXPERT=y · 8 unmodified lines | ||
| 9 | 9 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 10 | 10 | CONFIG_MODULES=y |
| 11 | 11 | CONFIG_MODULE_UNLOAD=y |
| 12 | −# CONFIG_LBDAF is not set | |
| 13 | 12 | # CONFIG_BLK_DEV_BSG is not set |
| 14 | 13 | CONFIG_PARTITION_ADVANCED=y |
| 15 | 14 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -14,7 +14,6 @@ CONFIG_PROFILING=y · 13 unmodified lines | ||
| 14 | 14 | CONFIG_OPROFILE=y |
| 15 | 15 | CONFIG_MODULES=y |
| 16 | 16 | CONFIG_MODULE_UNLOAD=y |
| 17 | −# CONFIG_LBDAF is not set | |
| 18 | 17 | # CONFIG_BLK_DEV_BSG is not set |
| 19 | 18 | # CONFIG_IOSCHED_DEADLINE is not set |
| 20 | 19 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -12,7 +12,6 @@ CONFIG_EMBEDDED=y · 11 unmodified lines | ||
| 12 | 12 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 13 | 13 | # CONFIG_SLUB_DEBUG is not set |
| 14 | 14 | # CONFIG_COMPAT_BRK is not set |
| 15 | −# CONFIG_LBDAF is not set | |
| 16 | 15 | # CONFIG_BLK_DEV_BSG is not set |
| 17 | 16 | # CONFIG_IOSCHED_CFQ is not set |
| 18 | 17 | # CONFIG_MMU is not set |
| @@ -11,7 +11,6 @@ CONFIG_SYSCTL_SYSCALL=y · 10 unmodified lines | ||
| 11 | 11 | # CONFIG_AIO is not set |
| 12 | 12 | CONFIG_EMBEDDED=y |
| 13 | 13 | CONFIG_MODULES=y |
| 14 | −# CONFIG_LBDAF is not set | |
| 15 | 14 | # CONFIG_BLK_DEV_BSG is not set |
| 16 | 15 | # CONFIG_IOSCHED_DEADLINE is not set |
| 17 | 16 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -17,7 +17,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y · 16 unmodified lines | ||
| 17 | 17 | CONFIG_EMBEDDED=y |
| 18 | 18 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 19 | 19 | # CONFIG_COMPAT_BRK is not set |
| 20 | −# CONFIG_LBDAF is not set | |
| 21 | 20 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | 21 | CONFIG_BLK_CMDLINE_PARSER=y |
| 23 | 22 | # CONFIG_MMU is not set |
| @@ -18,7 +18,6 @@ CONFIG_KEXEC=y · 17 unmodified lines | ||
| 18 | 18 | # CONFIG_SECCOMP is not set |
| 19 | 19 | CONFIG_MODULES=y |
| 20 | 20 | CONFIG_MODULE_UNLOAD=y |
| 21 | −# CONFIG_LBDAF is not set | |
| 22 | 21 | # CONFIG_BLK_DEV_BSG is not set |
| 23 | 22 | CONFIG_PARTITION_ADVANCED=y |
| 24 | 23 | CONFIG_BSD_DISKLABEL=y |
| @@ -17,7 +17,6 @@ CONFIG_TC=y · 16 unmodified lines | ||
| 17 | 17 | CONFIG_MODULES=y |
| 18 | 18 | CONFIG_MODULE_UNLOAD=y |
| 19 | 19 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 20 | −# CONFIG_LBDAF is not set | |
| 21 | 20 | CONFIG_PARTITION_ADVANCED=y |
| 22 | 21 | CONFIG_OSF_PARTITION=y |
| 23 | 22 | # CONFIG_EFI_PARTITION is not set |
| @@ -16,7 +16,6 @@ CONFIG_TC=y · 15 unmodified lines | ||
| 16 | 16 | CONFIG_MODULES=y |
| 17 | 17 | CONFIG_MODULE_UNLOAD=y |
| 18 | 18 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 19 | −# CONFIG_LBDAF is not set | |
| 20 | 19 | CONFIG_PARTITION_ADVANCED=y |
| 21 | 20 | CONFIG_OSF_PARTITION=y |
| 22 | 21 | # CONFIG_EFI_PARTITION is not set |
| @@ -19,7 +19,6 @@ CONFIG_MACH_LOONGSON32=y · 18 unmodified lines | ||
| 19 | 19 | CONFIG_MODULES=y |
| 20 | 20 | CONFIG_MODULE_UNLOAD=y |
| 21 | 21 | CONFIG_MODVERSIONS=y |
| 22 | −# CONFIG_LBDAF is not set | |
| 23 | 22 | # CONFIG_BLK_DEV_BSG is not set |
| 24 | 23 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 25 | 24 | CONFIG_NET=y |
| @@ -20,7 +20,6 @@ CONFIG_LOONGSON1_LS1C=y · 19 unmodified lines | ||
| 20 | 20 | CONFIG_MODULES=y |
| 21 | 21 | CONFIG_MODULE_UNLOAD=y |
| 22 | 22 | CONFIG_MODVERSIONS=y |
| 23 | −# CONFIG_LBDAF is not set | |
| 24 | 23 | # CONFIG_BLK_DEV_BSG is not set |
| 25 | 24 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 26 | 25 | CONFIG_NET=y |
| @@ -19,7 +19,6 @@ CONFIG_PCI=y · 18 unmodified lines | ||
| 19 | 19 | # CONFIG_PCI_QUIRKS is not set |
| 20 | 20 | CONFIG_MODULES=y |
| 21 | 21 | CONFIG_MODULE_UNLOAD=y |
| 22 | −# CONFIG_LBDAF is not set | |
| 23 | 22 | # CONFIG_BLK_DEV_BSG is not set |
| 24 | 23 | CONFIG_PARTITION_ADVANCED=y |
| 25 | 24 | CONFIG_MAC_PARTITION=y |
| @@ -17,7 +17,6 @@ CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP=y · 16 unmodified lines | ||
| 17 | 17 | CONFIG_PCI=y |
| 18 | 18 | CONFIG_MODULES=y |
| 19 | 19 | CONFIG_MODULE_UNLOAD=y |
| 20 | −# CONFIG_LBDAF is not set | |
| 21 | 20 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | 21 | CONFIG_NET=y |
| 23 | 22 | CONFIG_PACKET=y |
| @@ -14,7 +14,6 @@ CONFIG_SLAB=y · 13 unmodified lines | ||
| 14 | 14 | CONFIG_MODULES=y |
| 15 | 15 | CONFIG_MODULE_UNLOAD=y |
| 16 | 16 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 17 | −# CONFIG_LBDAF is not set | |
| 18 | 17 | # CONFIG_BLK_DEV_BSG is not set |
| 19 | 18 | CONFIG_PA7100LC=y |
| 20 | 19 | CONFIG_SMP=y |
| @@ -19,7 +19,6 @@ CONFIG_SLAB=y · 18 unmodified lines | ||
| 19 | 19 | CONFIG_PROFILING=y |
| 20 | 20 | CONFIG_MODULES=y |
| 21 | 21 | CONFIG_MODULE_UNLOAD=y |
| 22 | −# CONFIG_LBDAF is not set | |
| 23 | 22 | # CONFIG_BLK_DEV_BSG is not set |
| 24 | 23 | CONFIG_CFQ_GROUP_IOSCHED=y |
| 25 | 24 | CONFIG_CPU_SUBTYPE_SH7786=y |
| @@ -7,7 +7,6 @@ CONFIG_LOG_BUF_SHIFT=14 · 6 unmodified lines | ||
| 7 | 7 | CONFIG_BLK_DEV_INITRD=y |
| 8 | 8 | # CONFIG_KALLSYMS is not set |
| 9 | 9 | CONFIG_SLAB=y |
| 10 | −# CONFIG_LBDAF is not set | |
| 11 | 10 | # CONFIG_BLK_DEV_BSG is not set |
| 12 | 11 | CONFIG_CPU_SUBTYPE_SH7724=y |
| 13 | 12 | CONFIG_MEMORY_SIZE=0x10000000 |
| @@ -16,7 +16,6 @@ CONFIG_PERF_COUNTERS=y · 15 unmodified lines | ||
| 16 | 16 | CONFIG_SLAB=y |
| 17 | 17 | CONFIG_MMAP_ALLOW_UNINITIALIZED=y |
| 18 | 18 | CONFIG_PROFILING=y |
| 19 | −# CONFIG_LBDAF is not set | |
| 20 | 19 | # CONFIG_BLK_DEV_BSG is not set |
| 21 | 20 | CONFIG_PARTITION_ADVANCED=y |
| 22 | 21 | # CONFIG_IOSCHED_DEADLINE is not set |
| @@ -3,7 +3,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y · 2 unmodified lines | ||
| 3 | 3 | CONFIG_EMBEDDED=y |
| 4 | 4 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 5 | 5 | CONFIG_SLAB=y |
| 6 | −# CONFIG_LBDAF is not set | |
| 7 | 6 | # CONFIG_BLK_DEV_BSG is not set |
| 8 | 7 | # CONFIG_IOSCHED_DEADLINE is not set |
| 9 | 8 | # CONFIG_IOSCHED_CFQ is not set |
| @@ -11,7 +11,6 @@ CONFIG_PROFILING=y · 10 unmodified lines | ||
| 11 | 11 | CONFIG_GCOV_KERNEL=y |
| 12 | 12 | CONFIG_MODULES=y |
| 13 | 13 | CONFIG_MODULE_UNLOAD=y |
| 14 | −# CONFIG_LBDAF is not set | |
| 15 | 14 | # CONFIG_BLK_DEV_BSG is not set |
| 16 | 15 | CONFIG_CPU_SUBTYPE_SH7785=y |
| 17 | 16 | CONFIG_MEMORY_START=0x40000000 |
| @@ -26,30 +26,6 @@ menuconfig BLOCK · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | if BLOCK |
| 28 | 28 | |
| 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 | − | |
| 53 | 29 | config BLK_SCSI_REQUEST |
| 54 | 30 | bool |
| 55 | 31 | |
| @@ -1317,10 +1317,6 @@ struct bm_extent { · 1316 unmodified lines | ||
| 1317 | 1317 | |
| 1318 | 1318 | #define DRBD_MAX_SECTORS_FIXED_BM \ |
| 1319 | 1319 | ((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 | |
| 1324 | 1320 | #define DRBD_MAX_SECTORS DRBD_MAX_SECTORS_FIXED_BM |
| 1325 | 1321 | /* 16 TB in units of sectors */ |
| 1326 | 1322 | #if BITS_PER_LONG == 32 |
| @@ -1333,7 +1329,6 @@ struct bm_extent { · 6 unmodified lines | ||
| 1333 | 1329 | #define DRBD_MAX_SECTORS_FLEX (1UL << 51) |
| 1334 | 1330 | /* corresponds to (1UL << 38) bits right now. */ |
| 1335 | 1331 | #endif |
| 1336 | −#endif | |
| 1337 | 1332 | |
| 1338 | 1333 | /* Estimate max bio size as 256 * PAGE_SIZE, |
| 1339 | 1334 | * so for typical PAGE_SIZE of 4k, that is (1<<20) Byte. |
| @@ -102,7 +102,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, · 101 unmodified lines | ||
| 102 | 102 | |
| 103 | 103 | rq_for_each_segment(bvec, req, iter) { |
| 104 | 104 | 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", | |
| 106 | 106 | __func__, __LINE__, i, bio_sectors(iter.bio), |
| 107 | 107 | iter.bio->bi_iter.bi_sector); |
| 108 | 108 | |
| @@ -496,7 +496,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) · 387 unmodified lines | ||
| 496 | 496 | dev->regions[dev->region_idx].size*priv->blocking_factor); |
| 497 | 497 | |
| 498 | 498 | 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", | |
| 500 | 500 | gendisk->disk_name, priv->model, priv->raw_capacity >> 11, |
| 501 | 501 | get_capacity(gendisk) >> 11); |
| 502 | 502 | |
| @@ -135,9 +135,8 @@ struct dm_dev *dm_snap_cow(struct dm_snapshot *snap); · 134 unmodified lines | ||
| 135 | 135 | /* |
| 136 | 136 | * Funtions to manipulate consecutive chunks |
| 137 | 137 | */ |
| 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 | |
| 141 | 140 | |
| 142 | 141 | static inline chunk_t dm_chunk_number(chunk_t chunk) |
| 143 | 142 | { |
| @@ -163,29 +162,6 @@ static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e) · 19 unmodified lines | ||
| 163 | 162 | e->new_chunk -= (1ULL << DM_CHUNK_NUMBER_BITS); |
| 164 | 163 | } |
| 165 | 164 | |
| 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 | − | |
| 189 | 165 | /* |
| 190 | 166 | * Return the number of sectors in the device. |
| 191 | 167 | */ |
| @@ -88,14 +88,10 @@ struct journal_entry { · 87 unmodified lines | ||
| 88 | 88 | |
| 89 | 89 | #if BITS_PER_LONG == 64 |
| 90 | 90 | #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) | |
| 95 | 91 | #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) | |
| 98 | 93 | #endif |
| 94 | +#define journal_entry_get_sector(je) le64_to_cpu((je)->u.sector) | |
| 99 | 95 | #define journal_entry_is_unused(je) ((je)->u.s.sector_hi == cpu_to_le32(-1)) |
| 100 | 96 | #define journal_entry_set_unused(je) do { ((je)->u.s.sector_hi = cpu_to_le32(-1)); } while (0) |
| 101 | 97 | #define journal_entry_is_inprogress(je) ((je)->u.s.sector_hi == cpu_to_le32(-2)) |
| @@ -1106,8 +1106,7 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor · 1105 unmodified lines | ||
| 1106 | 1106 | * (not needed for Linear and RAID0 as metadata doesn't |
| 1107 | 1107 | * record this size) |
| 1108 | 1108 | */ |
| 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) | |
| 1111 | 1110 | rdev->sectors = (sector_t)(2ULL << 32) - 2; |
| 1112 | 1111 | |
| 1113 | 1112 | 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 | ||
| 1405 | 1404 | /* Limit to 4TB as metadata cannot record more than that. |
| 1406 | 1405 | * 4TB == 2^32 KB, or 2*2^32 sectors. |
| 1407 | 1406 | */ |
| 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) | |
| 1410 | 1408 | num_sectors = (sector_t)(2ULL << 32) - 2; |
| 1411 | 1409 | do { |
| 1412 | 1410 | md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, |
| @@ -391,7 +391,7 @@ static int nd_pfn_clear_memmap_errors(struct nd_pfn *nd_pfn) · 390 unmodified lines | ||
| 391 | 391 | bb_present = badblocks_check(&nd_region->bb, meta_start, |
| 392 | 392 | meta_num, &first_bad, &num_bad); |
| 393 | 393 | 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", | |
| 395 | 395 | num_bad, first_bad); |
| 396 | 396 | nsoff = ALIGN_DOWN((nd_region->ndr_start |
| 397 | 397 | + (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 | ||
| 410 | 410 | } |
| 411 | 411 | if (rc) { |
| 412 | 412 | dev_err(&nd_pfn->dev, |
| 413 | − "error clearing %x badblocks at %lx\n", | |
| 413 | + "error clearing %x badblocks at %llx\n", | |
| 414 | 414 | num_bad, first_bad); |
| 415 | 415 | return rc; |
| 416 | 416 | } |
| @@ -2256,22 +2256,6 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp, · 2255 unmodified lines | ||
| 2256 | 2256 | |
| 2257 | 2257 | #define READ_CAPACITY_RETRIES_ON_RESET 10 |
| 2258 | 2258 | |
| 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 | − | |
| 2275 | 2259 | static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, |
| 2276 | 2260 | unsigned char *buffer) |
| 2277 | 2261 | { |
| @@ -2337,14 +2321,6 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, · 59 unmodified lines | ||
| 2337 | 2321 | return -ENODEV; |
| 2338 | 2322 | } |
| 2339 | 2323 | |
| 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 | − | |
| 2348 | 2324 | /* Logical blocks per physical block exponent */ |
| 2349 | 2325 | sdkp->physical_block_size = (1 << (buffer[13] & 0xf)) * sector_size; |
| 2350 | 2326 | |
| @@ -2426,14 +2402,6 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, · 75 unmodified lines | ||
| 2426 | 2402 | return sector_size; |
| 2427 | 2403 | } |
| 2428 | 2404 | |
| 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 | − | |
| 2437 | 2405 | sdkp->capacity = lba + 1; |
| 2438 | 2406 | sdkp->physical_block_size = sector_size; |
| 2439 | 2407 | return sector_size; |
| @@ -1760,8 +1760,6 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, · 1759 unmodified lines | ||
| 1760 | 1760 | ext4_msg(sb, KERN_ERR, |
| 1761 | 1761 | "filesystem too large to resize to %llu blocks safely", |
| 1762 | 1762 | n_blocks_count); |
| 1763 | − if (sizeof(sector_t) < 8) | |
| 1764 | − ext4_warning(sb, "CONFIG_LBDAF not enabled"); | |
| 1765 | 1763 | return -EINVAL; |
| 1766 | 1764 | } |
| 1767 | 1765 | |
| @@ -2706,13 +2706,9 @@ static loff_t ext4_max_size(int blkbits, int has_huge_files) · 2705 unmodified lines | ||
| 2706 | 2706 | loff_t res; |
| 2707 | 2707 | loff_t upper_limit = MAX_LFS_FILESIZE; |
| 2708 | 2708 | |
| 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) { | |
| 2716 | 2712 | upper_limit = (1LL << 32) - 1; |
| 2717 | 2713 | |
| 2718 | 2714 | /* 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 | ||
| 2753 | 2749 | * number of 512-byte sectors of the file. |
| 2754 | 2750 | */ |
| 2755 | 2751 | |
| 2756 | − if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { | |
| 2752 | + if (!has_huge_files) { | |
| 2757 | 2753 | /* |
| 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 | |
| 2761 | 2757 | */ |
| 2762 | 2758 | upper_limit = (1LL << 32) - 1; |
| 2763 | 2759 | |
| @@ -2897,18 +2893,6 @@ static int ext4_feature_set_ok(struct super_block *sb, int readonly) · 133 unmodified lines | ||
| 2897 | 2893 | ~EXT4_FEATURE_RO_COMPAT_SUPP)); |
| 2898 | 2894 | return 0; |
| 2899 | 2895 | } |
| 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 | − } | |
| 2912 | 2896 | if (ext4_has_feature_bigalloc(sb) && !ext4_has_feature_extents(sb)) { |
| 2913 | 2897 | ext4_msg(sb, KERN_ERR, |
| 2914 | 2898 | "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 | ||
| 4057 | 4041 | if (err) { |
| 4058 | 4042 | ext4_msg(sb, KERN_ERR, "filesystem" |
| 4059 | 4043 | " too large to mount safely on this system"); |
| 4060 | − if (sizeof(sector_t) < 8) | |
| 4061 | − ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled"); | |
| 4062 | 4044 | goto failed_mount; |
| 4063 | 4045 | } |
| 4064 | 4046 | |
| @@ -1,6 +1,5 @@ | ||
| 1 | 1 | config GFS2_FS |
| 2 | 2 | tristate "GFS2 file system support" |
| 3 | − depends on (64BIT || LBDAF) | |
| 4 | 3 | select FS_POSIX_ACL |
| 5 | 4 | select CRC32 |
| 6 | 5 | select LIBCRC32C |
| @@ -121,7 +121,6 @@ config PNFS_FILE_LAYOUT · 120 unmodified lines | ||
| 121 | 121 | config PNFS_BLOCK |
| 122 | 122 | tristate |
| 123 | 123 | depends on NFS_V4_1 && BLK_DEV_DM |
| 124 | − depends on 64BIT || LBDAF | |
| 125 | 124 | default NFS_V4 |
| 126 | 125 | |
| 127 | 126 | config PNFS_FLEXFILE_LAYOUT |
| @@ -600,7 +600,6 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits, · 599 unmodified lines | ||
| 600 | 600 | */ |
| 601 | 601 | |
| 602 | 602 | #if BITS_PER_LONG == 32 |
| 603 | −# if defined(CONFIG_LBDAF) | |
| 604 | 603 | BUILD_BUG_ON(sizeof(sector_t) != 8); |
| 605 | 604 | /* |
| 606 | 605 | * 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 | ||
| 614 | 613 | */ |
| 615 | 614 | bitshift = 31; |
| 616 | 615 | } |
| 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 | |
| 626 | 616 | #endif |
| 627 | 617 | |
| 628 | 618 | /* |
| @@ -21,11 +21,10 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src) · 20 unmodified lines | ||
| 21 | 21 | i_size = i_size_read(src); |
| 22 | 22 | |
| 23 | 23 | /* |
| 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. | |
| 29 | 28 | * |
| 30 | 29 | * We don't actually know what locking is used at the lower level; |
| 31 | 30 | * 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 | ||
| 44 | 43 | * include/linux/fs.h). We don't necessarily hold i_mutex when this |
| 45 | 44 | * is called, so take i_lock for that case. |
| 46 | 45 | * |
| 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. | |
| 50 | 49 | * |
| 51 | 50 | * There is none of this locking overhead in the 64-bit case. |
| 52 | 51 | */ |
| @@ -1,7 +1,6 @@ | ||
| 1 | 1 | config XFS_FS |
| 2 | 2 | tristate "XFS filesystem support" |
| 3 | 3 | depends on BLOCK |
| 4 | − depends on (64BIT || LBDAF) | |
| 5 | 4 | select EXPORTFS |
| 6 | 5 | select LIBCRC32C |
| 7 | 6 | select FS_IOMAP |
| @@ -539,26 +539,18 @@ xfs_max_file_offset( · 538 unmodified lines | ||
| 539 | 539 | |
| 540 | 540 | /* Figure out maximum filesize, on Linux this can depend on |
| 541 | 541 | * 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... | |
| 543 | 543 | * page->index << (PAGE_SHIFT - bbits) |
| 544 | 544 | * So, for page sized blocks (4K on 32 bit platforms), |
| 545 | 545 | * this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is |
| 546 | 546 | * (((u64)PAGE_SIZE << (BITS_PER_LONG-1))-1) |
| 547 | 547 | * 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. | |
| 552 | 548 | */ |
| 553 | 549 | |
| 554 | 550 | #if BITS_PER_LONG == 32 |
| 555 | −# if defined(CONFIG_LBDAF) | |
| 556 | 551 | ASSERT(sizeof(sector_t) == 8); |
| 557 | 552 | pagefactor = PAGE_SIZE; |
| 558 | 553 | bitshift = BITS_PER_LONG; |
| 559 | −# else | |
| 560 | − pagefactor = PAGE_SIZE >> (PAGE_SHIFT - blockshift); | |
| 561 | −# endif | |
| 562 | 554 | #endif |
| 563 | 555 | |
| 564 | 556 | return (((uint64_t)pagefactor) << bitshift) - 1; |
| @@ -714,7 +714,7 @@ static inline void hd_free_part(struct hd_struct *part) · 713 unmodified lines | ||
| 714 | 714 | */ |
| 715 | 715 | static inline sector_t part_nr_sects_read(struct hd_struct *part) |
| 716 | 716 | { |
| 717 | −#if BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_SMP) | |
| 717 | +#if BITS_PER_LONG==32 && defined(CONFIG_SMP) | |
| 718 | 718 | sector_t nr_sects; |
| 719 | 719 | unsigned seq; |
| 720 | 720 | do { |
| @@ -722,7 +722,7 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part) · 1 unmodified line | ||
| 722 | 722 | nr_sects = part->nr_sects; |
| 723 | 723 | } while (read_seqcount_retry(&part->nr_sects_seq, seq)); |
| 724 | 724 | return nr_sects; |
| 725 | −#elif BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_PREEMPT) | |
| 725 | +#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) | |
| 726 | 726 | sector_t nr_sects; |
| 727 | 727 | |
| 728 | 728 | preempt_disable(); |
| @@ -741,11 +741,11 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part) · 12 unmodified lines | ||
| 741 | 741 | */ |
| 742 | 742 | static inline void part_nr_sects_write(struct hd_struct *part, sector_t size) |
| 743 | 743 | { |
| 744 | −#if BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_SMP) | |
| 744 | +#if BITS_PER_LONG==32 && defined(CONFIG_SMP) | |
| 745 | 745 | write_seqcount_begin(&part->nr_sects_seq); |
| 746 | 746 | part->nr_sects = size; |
| 747 | 747 | 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) | |
| 749 | 749 | preempt_disable(); |
| 750 | 750 | part->nr_sects = size; |
| 751 | 751 | preempt_enable(); |
| @@ -17,6 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <asm/byteorder.h> |
| 18 | 18 | #include <asm/div64.h> |
| 19 | 19 | #include <uapi/linux/kernel.h> |
| 20 | +#include <asm/div64.h> | |
| 20 | 21 | |
| 21 | 22 | #define STACK_MAGIC 0xdeadbeef |
| 22 | 23 | |
| @@ -175,18 +176,7 @@ · 152 unmodified lines | ||
| 175 | 176 | #define _RET_IP_ (unsigned long)__builtin_return_address(0) |
| 176 | 177 | #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) |
| 177 | 178 | |
| 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) | |
| 190 | 180 | |
| 191 | 181 | /** |
| 192 | 182 | * upper_32_bits - return bits 32-63 of a number |
| @@ -127,13 +127,8 @@ typedef s64 int64_t; · 126 unmodified lines | ||
| 127 | 127 | * |
| 128 | 128 | * blkcnt_t is the type of the inode's block count. |
| 129 | 129 | */ |
| 130 | −#ifdef CONFIG_LBDAF | |
| 131 | 130 | typedef u64 sector_t; |
| 132 | 131 | typedef u64 blkcnt_t; |
| 133 | −#else | |
| 134 | −typedef unsigned long sector_t; | |
| 135 | −typedef unsigned long blkcnt_t; | |
| 136 | −#endif | |
| 137 | 132 | |
| 138 | 133 | /* |
| 139 | 134 | * The type of an index into the pagecache. |
| @@ -1927,7 +1927,6 @@ config TEST_STATIC_KEYS · 1926 unmodified lines | ||
| 1927 | 1927 | config TEST_KMOD |
| 1928 | 1928 | tristate "kmod stress tester" |
| 1929 | 1929 | depends on m |
| 1930 | − depends on BLOCK && (64BIT || LBDAF) # for XFS, BTRFS | |
| 1931 | 1930 | depends on NETDEVICES && NET_CORE && INET # for TUN |
| 1932 | 1931 | select TEST_LKM |
| 1933 | 1932 | select XFS_FS |
| @@ -59,11 +59,7 @@ typedef __u32 uint32_t; · 58 unmodified lines | ||
| 59 | 59 | * |
| 60 | 60 | * blkcnt_t is the type of the inode's block count. |
| 61 | 61 | */ |
| 62 | −#ifdef CONFIG_LBDAF | |
| 63 | 62 | typedef u64 sector_t; |
| 64 | −#else | |
| 65 | −typedef unsigned long sector_t; | |
| 66 | −#endif | |
| 67 | 63 | |
| 68 | 64 | /* |
| 69 | 65 | * The type of an index into the pagecache. |