Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26473f83 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iomap-5.3-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull iomap split/cleanup from Darrick Wong:
 "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.

  Summary:

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

* tag 'iomap-5.3-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: move internal declarations into fs/iomap/
  iomap: move the main iteration code into a separate file
  iomap: move the buffered IO code into a separate file
  iomap: move the direct IO code into a separate file
  iomap: move the SEEK_HOLE code into a separate file
  iomap: move the file mapping reporting code into a separate file
  iomap: move the swapfile code into a separate file
  iomap: start moving code to fs/iomap/
parents 4f5ed131 5d907307

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8415,6 +8415,7 @@ L: linux-fsdevel@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git

S:	Supported

F:	fs/iomap.c

F:	fs/iomap/

F:	include/linux/iomap.h



IOMMU DRIVERS

fs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ obj-$(CONFIG_COREDUMP) += coredump.o 
obj-$(CONFIG_SYSCTL)		+= drop_caches.o



obj-$(CONFIG_FHANDLE)		+= fhandle.o

obj-$(CONFIG_FS_IOMAP)		+= iomap.o

obj-y				+= iomap/



obj-y				+= quota/

fs/dax.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/mmu_notifier.h>

#include <linux/iomap.h>

#include <asm/pgalloc.h>

#include "internal.h"



#define CREATE_TRACE_POINTS

#include <trace/events/fs_dax.h>

fs/internal.h

+0 −10
Original line number Diff line number Diff line
@@ -185,15 +185,5 @@ extern const struct dentry_operations ns_dentry_operations; 
extern int do_vfs_ioctl(struct file *file, unsigned int fd, unsigned int cmd,

		    unsigned long arg);



/*

 * iomap support:

 */

typedef loff_t (*iomap_actor_t)(struct inode *inode, loff_t pos, loff_t len,

		void *data, struct iomap *iomap);



loff_t iomap_apply(struct inode *inode, loff_t pos, loff_t length,

		unsigned flags, const struct iomap_ops *ops, void *data,

		iomap_actor_t actor);



/* direct-io.c: */

int sb_init_dio_done_wq(struct super_block *sb);

fs/iomap/Makefile

0 → 100644
+15 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-or-newer

#

# Copyright (c) 2019 Oracle.

# All Rights Reserved.

#

obj-$(CONFIG_FS_IOMAP)		+= iomap.o



iomap-y				+= \

					apply.o \

					buffered-io.o \

					direct-io.o \

					fiemap.o \

					seek.o



iomap-$(CONFIG_SWAP)		+= swapfile.o