xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs: move struct iomap from exportfs.h to a separate header

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig
2016-06-21 09:22:39 +10:00
committed by Dave Chinner
parent 1a695a905c
commit 199a31c6d9
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfsd/blocklayout.c
View File

@@ -2,6 +2,7 @@
* Copyright (c) 2014-2016 Christoph Hellwig. * Copyright (c) 2014-2016 Christoph Hellwig.
*/ */
#include <linux/exportfs.h> #include <linux/exportfs.h>
#include <linux/iomap.h>
#include <linux/genhd.h> #include <linux/genhd.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pr.h> #include <linux/pr.h>

1
fs/nfsd/blocklayoutxdr.c
View File

@@ -3,6 +3,7 @@
*/ */
#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svc.h>
#include <linux/exportfs.h> #include <linux/exportfs.h>
#include <linux/iomap.h>
#include <linux/nfs4.h> #include <linux/nfs4.h>
#include "nfsd.h" #include "nfsd.h"

1
fs/xfs/xfs_pnfs.c
View File

@@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2014 Christoph Hellwig. * Copyright (c) 2014 Christoph Hellwig.
*/ */
#include <linux/iomap.h>
#include "xfs.h" #include "xfs.h"
#include "xfs_format.h" #include "xfs_format.h"
#include "xfs_log_format.h" #include "xfs_log_format.h"

16
include/linux/exportfs.h
View File

@@ -6,6 +6,7 @@
struct dentry; struct dentry;
struct iattr; struct iattr;
struct inode; struct inode;
struct iomap;
struct super_block; struct super_block;
struct vfsmount; struct vfsmount;
@@ -187,21 +188,6 @@ struct fid {
* get_name is not (which is possibly inconsistent) * get_name is not (which is possibly inconsistent)
*/ */
/* types of block ranges for multipage write mappings. */
#define IOMAP_HOLE 0x01 /* no blocks allocated, need allocation */
#define IOMAP_DELALLOC 0x02 /* delayed allocation blocks */
#define IOMAP_MAPPED 0x03 /* blocks allocated @blkno */
#define IOMAP_UNWRITTEN 0x04 /* blocks allocated @blkno in unwritten state */
#define IOMAP_NULL_BLOCK -1LL /* blkno is not valid */
struct iomap {
sector_t blkno; /* first sector of mapping */
loff_t offset; /* file offset of mapping, bytes */
u64 length; /* length of mapping, bytes */
int type; /* type of mapping */
};
struct export_operations { struct export_operations {
int (*encode_fh)(struct inode *inode, __u32 *fh, int *max_len, int (*encode_fh)(struct inode *inode, __u32 *fh, int *max_len,
struct inode *parent); struct inode *parent);

21
include/linux/iomap.h Normal file
View File

@@ -0,0 +1,21 @@
#ifndef LINUX_IOMAP_H
#define LINUX_IOMAP_H 1
#include <linux/types.h>
/* types of block ranges for multipage write mappings. */
#define IOMAP_HOLE 0x01 /* no blocks allocated, need allocation */
#define IOMAP_DELALLOC 0x02 /* delayed allocation blocks */
#define IOMAP_MAPPED 0x03 /* blocks allocated @blkno */
#define IOMAP_UNWRITTEN 0x04 /* blocks allocated @blkno in unwritten state */
#define IOMAP_NULL_BLOCK -1LL /* blkno is not valid */
struct iomap {
sector_t blkno; /* first sector of mapping */
loff_t offset; /* file offset of mapping, bytes */
u64 length; /* length of mapping, bytes */
int type; /* type of mapping */
};
#endif /* LINUX_IOMAP_H */