redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

iomap: move internal declarations into fs/iomap/ 

Move internal function declarations out of fs/internal.h into
include/linux/iomap.h so that our transition is complete.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
alistair/sunxi64-5.4-dsi
Darrick J. Wong 2019-07-15 08:51:01 -07:00
parent cb7181ff4b
commit 5d907307ad
7 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/dax.c
View File

@ -26,7 +26,6 @@
#include <linux/mmu_notifier.h> #include <linux/mmu_notifier.h>
#include <linux/iomap.h> #include <linux/iomap.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include "internal.h"
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <trace/events/fs_dax.h> #include <trace/events/fs_dax.h>

10
fs/internal.h
View File

@ -182,15 +182,5 @@ extern const struct dentry_operations ns_dentry_operations;
extern int do_vfs_ioctl(struct file *file, unsigned int fd, unsigned int cmd, extern int do_vfs_ioctl(struct file *file, unsigned int fd, unsigned int cmd,
unsigned long arg); 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: */ /* direct-io.c: */
int sb_init_dio_done_wq(struct super_block *sb); int sb_init_dio_done_wq(struct super_block *sb);

2
fs/iomap/apply.c
View File

@ -8,8 +8,6 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/iomap.h> #include <linux/iomap.h>
#include "../internal.h"
/* /*
* Execute a iomap write on a segment of the mapping that spans a * Execute a iomap write on a segment of the mapping that spans a
* contiguous range of pages that have identical block mapping state. * contiguous range of pages that have identical block mapping state.

2
fs/iomap/fiemap.c
View File

@ -7,8 +7,6 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/iomap.h> #include <linux/iomap.h>
#include "../internal.h"
struct fiemap_ctx { struct fiemap_ctx {
struct fiemap_extent_info *fi; struct fiemap_extent_info *fi;
struct iomap prev; struct iomap prev;

2
fs/iomap/seek.c
View File

@ -10,8 +10,6 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/pagevec.h> #include <linux/pagevec.h>
#include "../internal.h"
/* /*
* Seek for SEEK_DATA / SEEK_HOLE within @page, starting at @lastoff. * Seek for SEEK_DATA / SEEK_HOLE within @page, starting at @lastoff.
* Returns true if found and updates @lastoff to the offset in file. * Returns true if found and updates @lastoff to the offset in file.

2
fs/iomap/swapfile.c
View File

@ -9,8 +9,6 @@
#include <linux/iomap.h> #include <linux/iomap.h>
#include <linux/swap.h> #include <linux/swap.h>
#include "../internal.h"
/* Swapfile activation */ /* Swapfile activation */
struct iomap_swapfile_info { struct iomap_swapfile_info {

10
include/linux/iomap.h
View File

@ -122,6 +122,16 @@ struct iomap_ops {
ssize_t written, unsigned flags, struct iomap *iomap); ssize_t written, unsigned flags, struct iomap *iomap);
}; };
/*
* Main iomap iterator function.
*/
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);
/* /*
* Structure allocate for each page when block size < PAGE_SIZE to track * Structure allocate for each page when block size < PAGE_SIZE to track
* sub-page uptodate status and I/O completions. * sub-page uptodate status and I/O completions.