[GIT,PULL] iomap: cleanups for 5.3 (part 2)
mbox series

Message ID 20190719162221.GF7093@magnolia
State New
Headers show
Series
  • [GIT,PULL] iomap: cleanups for 5.3 (part 2)
Related show

Pull-request

git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/iomap-5.3-merge-4

Message

Darrick J. Wong July 19, 2019, 4:22 p.m. UTC
Hi Linus,

As promised, here's the second part of the iomap merge for 5.3, in which
we break up iomap.c into smaller files grouped by functional area so
that it'll be easier in the long run to maintain cohesiveness of code
units and to review incoming patches.  There are no functional changes
and fs/iomap.c split cleanly.

Note that this refactoring series has been lurking in for-next during
the merge window, but I rebased the series a couple of days ago to pick
up all the fs/iomap.c changes that came in earlier in the merge window
from other trees, and now you don't have to pick up the pieces of a
somewhat messy merge collision. :)

The branch merges cleanly against this morning's HEAD (3bfe1fc46794) and
survived an overnight run of xfstests.  The merge was completely
straightforward, so please let me know if you run into anything weird.

The only weirdness I've seen so far is that the new kernel header
compile test (CONFIG_KERNEL_HEADER_TEST) tries to test-compile iomap.h
even when CONFIG_BLOCK=n and fails, but that combination wouldn't work
even in regular kernel code because iomap is a support library for
filesystems that use block devices.  Masahiro Yamada sent a patch
earlier today to disable the header compile test for now while he
reconsiders its strategy.

--D

The following changes since commit fec88ab0af9706b2201e5daf377c5031c62d11f7:

  Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (2019-07-14 19:42:11 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/iomap-5.3-merge-4

for you to fetch changes up to 5d907307adc14cd5148b07629c2b4535acd06062:

  iomap: move internal declarations into fs/iomap/ (2019-07-17 07:21:02 -0700)

----------------------------------------------------------------
Also new for 5.3:
- Regroup the fs/iomap.c code by major functional area so that we can
  start development for 5.4 from a more stable base.

----------------------------------------------------------------
Darrick J. Wong (8):
      iomap: start moving code to fs/iomap/
      iomap: move the swapfile code into a separate file
      iomap: move the file mapping reporting code into a separate file
      iomap: move the SEEK_HOLE code into a separate file
      iomap: move the direct IO code into a separate file
      iomap: move the buffered IO code into a separate file
      iomap: move the main iteration code into a separate file
      iomap: move internal declarations into fs/iomap/

 MAINTAINERS            |    1 +
 fs/Makefile            |    2 +-
 fs/dax.c               |    1 -
 fs/internal.h          |   10 -
 fs/iomap.c             | 2205 ------------------------------------------------
 fs/iomap/Makefile      |   15 +
 fs/iomap/apply.c       |   74 ++
 fs/iomap/buffered-io.c | 1073 +++++++++++++++++++++++
 fs/iomap/direct-io.c   |  562 ++++++++++++
 fs/iomap/fiemap.c      |  144 ++++
 fs/iomap/seek.c        |  212 +++++
 fs/iomap/swapfile.c    |  178 ++++
 include/linux/iomap.h  |   17 +
 13 files changed, 2277 insertions(+), 2217 deletions(-)
 delete mode 100644 fs/iomap.c
 create mode 100644 fs/iomap/Makefile
 create mode 100644 fs/iomap/apply.c
 create mode 100644 fs/iomap/buffered-io.c
 create mode 100644 fs/iomap/direct-io.c
 create mode 100644 fs/iomap/fiemap.c
 create mode 100644 fs/iomap/seek.c
 create mode 100644 fs/iomap/swapfile.c

Comments

pr-tracker-bot@kernel.org July 19, 2019, 7:45 p.m. UTC | #1
The pull request you sent on Fri, 19 Jul 2019 09:22:21 -0700:

> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/iomap-5.3-merge-4

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/26473f83703e6bc56114ce4b045000de6efcfff7

Thank you!