From: Ritesh Harjani <riteshh@linux.ibm.com>
To: Christoph Hellwig <hch@lst.de>,
linux-ext4@vger.kernel.org, viro@zeniv.linux.org.uk
Cc: jack@suse.cz, tytso@mit.edu, adilger@dilger.ca,
amir73il@gmail.com, linux-fsdevel@vger.kernel.org,
linux-unionfs@vger.kernel.org
Subject: Re: [PATCH 06/11] fs: move the fiemap definitions out of fs.h
Date: Sat, 2 May 2020 04:53:21 +0530 [thread overview]
Message-ID: <20200501232322.9073AAE04D@d06av26.portsmouth.uk.ibm.com> (raw)
In-Reply-To: <20200427181957.1606257-7-hch@lst.de>
On 4/27/20 11:49 PM, Christoph Hellwig wrote:
> No need to pull the fiemap definitions into almost every file in the
> kernel build.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Nice,
Feel free to add:
Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
> ---
> fs/bad_inode.c | 1 +
> fs/btrfs/extent_io.h | 1 +
> fs/cifs/inode.c | 1 +
> fs/cifs/smb2ops.c | 1 +
> fs/ext2/inode.c | 1 +
> fs/ext4/ext4.h | 1 +
> fs/f2fs/data.c | 1 +
> fs/f2fs/inline.c | 1 +
> fs/gfs2/inode.c | 1 +
> fs/hpfs/file.c | 1 +
> fs/ioctl.c | 1 +
> fs/iomap/fiemap.c | 1 +
> fs/nilfs2/inode.c | 1 +
> fs/overlayfs/inode.c | 1 +
> fs/xfs/xfs_iops.c | 1 +
> include/linux/fiemap.h | 24 ++++++++++++++++++++++++
> include/linux/fs.h | 19 +------------------
> include/uapi/linux/fiemap.h | 6 +++---
> 18 files changed, 43 insertions(+), 21 deletions(-)
> create mode 100644 include/linux/fiemap.h
>
> diff --git a/fs/bad_inode.c b/fs/bad_inode.c
> index 8035d2a445617..54f0ce4442720 100644
> --- a/fs/bad_inode.c
> +++ b/fs/bad_inode.c
> @@ -15,6 +15,7 @@
> #include <linux/time.h>
> #include <linux/namei.h>
> #include <linux/poll.h>
> +#include <linux/fiemap.h>
>
> static int bad_file_open(struct inode *inode, struct file *filp)
> {
> diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
> index 2ed65bd0760ea..817698bc06693 100644
> --- a/fs/btrfs/extent_io.h
> +++ b/fs/btrfs/extent_io.h
> @@ -5,6 +5,7 @@
>
> #include <linux/rbtree.h>
> #include <linux/refcount.h>
> +#include <linux/fiemap.h>
> #include "ulist.h"
>
> /*
> diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
> index 390d2b15ef6ef..3f276eb8ca68d 100644
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@ -25,6 +25,7 @@
> #include <linux/freezer.h>
> #include <linux/sched/signal.h>
> #include <linux/wait_bit.h>
> +#include <linux/fiemap.h>
>
> #include <asm/div64.h>
> #include "cifsfs.h"
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index f829f4165d38c..09047f1ddfb66 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -12,6 +12,7 @@
> #include <linux/uuid.h>
> #include <linux/sort.h>
> #include <crypto/aead.h>
> +#include <linux/fiemap.h>
> #include "cifsfs.h"
> #include "cifsglob.h"
> #include "smb2pdu.h"
> diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
> index c885cf7d724b4..0f12a0e8a8d97 100644
> --- a/fs/ext2/inode.c
> +++ b/fs/ext2/inode.c
> @@ -36,6 +36,7 @@
> #include <linux/iomap.h>
> #include <linux/namei.h>
> #include <linux/uio.h>
> +#include <linux/fiemap.h>
> #include "ext2.h"
> #include "acl.h"
> #include "xattr.h"
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index ad2dbf6e49245..06f97a3a943f6 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -36,6 +36,7 @@
> #include <crypto/hash.h>
> #include <linux/falloc.h>
> #include <linux/percpu-rwsem.h>
> +#include <linux/fiemap.h>
> #ifdef __KERNEL__
> #include <linux/compat.h>
> #endif
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index cdf2f626bea7a..25abbbb65ba09 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -19,6 +19,7 @@
> #include <linux/uio.h>
> #include <linux/cleancache.h>
> #include <linux/sched/signal.h>
> +#include <linux/fiemap.h>
>
> #include "f2fs.h"
> #include "node.h"
> diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
> index 4167e54081518..9686ffea177e7 100644
> --- a/fs/f2fs/inline.c
> +++ b/fs/f2fs/inline.c
> @@ -8,6 +8,7 @@
>
> #include <linux/fs.h>
> #include <linux/f2fs_fs.h>
> +#include <linux/fiemap.h>
>
> #include "f2fs.h"
> #include "node.h"
> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
> index 70b2d3a1e8668..4842f313a8084 100644
> --- a/fs/gfs2/inode.c
> +++ b/fs/gfs2/inode.c
> @@ -17,6 +17,7 @@
> #include <linux/crc32.h>
> #include <linux/iomap.h>
> #include <linux/security.h>
> +#include <linux/fiemap.h>
> #include <linux/uaccess.h>
>
> #include "gfs2.h"
> diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
> index b36abf9cb345a..62959a8e43ad8 100644
> --- a/fs/hpfs/file.c
> +++ b/fs/hpfs/file.c
> @@ -9,6 +9,7 @@
>
> #include "hpfs_fn.h"
> #include <linux/mpage.h>
> +#include <linux/fiemap.h>
>
> #define BLOCKS(size) (((size) + 511) >> 9)
>
> diff --git a/fs/ioctl.c b/fs/ioctl.c
> index f55f53c7824bb..cbc84e23d00bd 100644
> --- a/fs/ioctl.c
> +++ b/fs/ioctl.c
> @@ -18,6 +18,7 @@
> #include <linux/buffer_head.h>
> #include <linux/falloc.h>
> #include <linux/sched/signal.h>
> +#include <linux/fiemap.h>
>
> #include "internal.h"
>
> diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c
> index bccf305ea9ce2..fca3dfb9d964a 100644
> --- a/fs/iomap/fiemap.c
> +++ b/fs/iomap/fiemap.c
> @@ -6,6 +6,7 @@
> #include <linux/compiler.h>
> #include <linux/fs.h>
> #include <linux/iomap.h>
> +#include <linux/fiemap.h>
>
> struct fiemap_ctx {
> struct fiemap_extent_info *fi;
> diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
> index 671085512e0fd..6e1aca38931f3 100644
> --- a/fs/nilfs2/inode.c
> +++ b/fs/nilfs2/inode.c
> @@ -14,6 +14,7 @@
> #include <linux/pagemap.h>
> #include <linux/writeback.h>
> #include <linux/uio.h>
> +#include <linux/fiemap.h>
> #include "nilfs.h"
> #include "btnode.h"
> #include "segment.h"
> diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
> index b0d42ece4d7cc..b5fec34105569 100644
> --- a/fs/overlayfs/inode.c
> +++ b/fs/overlayfs/inode.c
> @@ -10,6 +10,7 @@
> #include <linux/xattr.h>
> #include <linux/posix_acl.h>
> #include <linux/ratelimit.h>
> +#include <linux/fiemap.h>
> #include "overlayfs.h"
>
>
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index f7a99b3bbcf7a..44c353998ac5c 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -25,6 +25,7 @@
> #include <linux/posix_acl.h>
> #include <linux/security.h>
> #include <linux/iversion.h>
> +#include <linux/fiemap.h>
>
> /*
> * Directories have different lock order w.r.t. mmap_sem compared to regular
> diff --git a/include/linux/fiemap.h b/include/linux/fiemap.h
> new file mode 100644
> index 0000000000000..240d4f7d9116a
> --- /dev/null
> +++ b/include/linux/fiemap.h
> @@ -0,0 +1,24 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _LINUX_FIEMAP_H
> +#define _LINUX_FIEMAP_H 1
> +
> +#include <uapi/linux/fiemap.h>
> +#include <linux/fs.h>
> +
> +struct fiemap_extent_info {
> + unsigned int fi_flags; /* Flags as passed from user */
> + unsigned int fi_extents_mapped; /* Number of mapped extents */
> + unsigned int fi_extents_max; /* Size of fiemap_extent array */
> + struct fiemap_extent __user *fi_extents_start; /* Start of
> + fiemap_extent array */
> +};
> +
> +int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
> + u64 phys, u64 len, u32 flags);
> +int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);
> +
> +int generic_block_fiemap(struct inode *inode,
> + struct fiemap_extent_info *fieinfo, u64 start, u64 len,
> + get_block_t *get_block);
> +
> +#endif /* _LINUX_FIEMAP_H 1 */
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 3104c6f7527b5..09bcd329c0628 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -24,7 +24,6 @@
> #include <linux/capability.h>
> #include <linux/semaphore.h>
> #include <linux/fcntl.h>
> -#include <linux/fiemap.h>
> #include <linux/rculist_bl.h>
> #include <linux/atomic.h>
> #include <linux/shrinker.h>
> @@ -48,6 +47,7 @@ struct backing_dev_info;
> struct bdi_writeback;
> struct bio;
> struct export_operations;
> +struct fiemap_extent_info;
> struct hd_geometry;
> struct iovec;
> struct kiocb;
> @@ -1745,19 +1745,6 @@ extern long compat_ptr_ioctl(struct file *file, unsigned int cmd,
> extern void inode_init_owner(struct inode *inode, const struct inode *dir,
> umode_t mode);
> extern bool may_open_dev(const struct path *path);
> -/*
> - * VFS FS_IOC_FIEMAP helper definitions.
> - */
> -struct fiemap_extent_info {
> - unsigned int fi_flags; /* Flags as passed from user */
> - unsigned int fi_extents_mapped; /* Number of mapped extents */
> - unsigned int fi_extents_max; /* Size of fiemap_extent array */
> - struct fiemap_extent __user *fi_extents_start; /* Start of
> - fiemap_extent array */
> -};
> -int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
> - u64 phys, u64 len, u32 flags);
> -int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);
>
> /*
> * This is the "filldir" function type, used by readdir() to let
> @@ -3299,10 +3286,6 @@ static inline int vfs_fstat(int fd, struct kstat *stat)
> extern const char *vfs_get_link(struct dentry *, struct delayed_call *);
> extern int vfs_readlink(struct dentry *, char __user *, int);
>
> -extern int generic_block_fiemap(struct inode *inode,
> - struct fiemap_extent_info *fieinfo, u64 start,
> - u64 len, get_block_t *get_block);
> -
> extern struct file_system_type *get_filesystem(struct file_system_type *fs);
> extern void put_filesystem(struct file_system_type *fs);
> extern struct file_system_type *get_fs_type(const char *name);
> diff --git a/include/uapi/linux/fiemap.h b/include/uapi/linux/fiemap.h
> index 7a900b2377b60..24ca0c00cae36 100644
> --- a/include/uapi/linux/fiemap.h
> +++ b/include/uapi/linux/fiemap.h
> @@ -9,8 +9,8 @@
> * Andreas Dilger <adilger@sun.com>
> */
>
> -#ifndef _LINUX_FIEMAP_H
> -#define _LINUX_FIEMAP_H
> +#ifndef _UAPI_LINUX_FIEMAP_H
> +#define _UAPI_LINUX_FIEMAP_H
>
> #include <linux/types.h>
>
> @@ -67,4 +67,4 @@ struct fiemap {
> #define FIEMAP_EXTENT_SHARED 0x00002000 /* Space shared with other
> * files. */
>
> -#endif /* _LINUX_FIEMAP_H */
> +#endif /* _UAPI_LINUX_FIEMAP_H */
>
next prev parent reply other threads:[~2020-05-01 23:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 18:19 fix fiemap for ext4 bitmap files (+ cleanups) v2 Christoph Hellwig
2020-04-27 18:19 ` [PATCH 01/11] ext4: fix EXT4_MAX_LOGICAL_BLOCK macro Christoph Hellwig
2020-04-27 18:19 ` [PATCH 02/11] ext4: fix fiemap size checks for bitmap files Christoph Hellwig
2020-05-01 23:20 ` Ritesh Harjani
2020-04-27 18:19 ` [PATCH 03/11] ext4: split _ext4_fiemap Christoph Hellwig
2020-05-01 23:21 ` Ritesh Harjani
2020-04-27 18:19 ` [PATCH 04/11] ext4: remove the call to fiemap_check_flags in ext4_fiemap Christoph Hellwig
2020-05-01 23:21 ` Ritesh Harjani
2020-04-27 18:19 ` [PATCH 05/11] fs: mark __generic_block_fiemap static Christoph Hellwig
2020-04-28 15:06 ` Darrick J. Wong
2020-05-01 23:22 ` Ritesh Harjani
2020-04-27 18:19 ` [PATCH 06/11] fs: move the fiemap definitions out of fs.h Christoph Hellwig
2020-04-28 15:07 ` Darrick J. Wong
2020-05-01 23:23 ` Ritesh Harjani [this message]
2020-04-27 18:19 ` [PATCH 07/11] iomap: fix the iomap_fiemap prototype Christoph Hellwig
2020-04-28 15:08 ` Darrick J. Wong
2020-05-01 23:34 ` Ritesh Harjani
2020-05-05 10:29 ` Christoph Hellwig
2020-04-27 18:19 ` [PATCH 08/11] fs: move fiemap range validation into the file systems instances Christoph Hellwig
2020-04-28 2:35 ` Amir Goldstein
2020-04-28 15:14 ` Darrick J. Wong
2020-05-01 22:49 ` Ritesh Harjani
2020-05-05 10:37 ` Christoph Hellwig
2020-04-27 18:19 ` [PATCH 09/11] fs: handle FIEMAP_FLAG_SYNC in fiemap_prep Christoph Hellwig
2020-04-28 2:26 ` Amir Goldstein
2020-04-28 15:16 ` Darrick J. Wong
2020-05-01 22:52 ` Ritesh Harjani
2020-05-05 10:43 ` Christoph Hellwig
2020-04-27 18:19 ` [PATCH 10/11] fs: remove the access_ok() check in ioctl_fiemap Christoph Hellwig
2020-04-28 15:21 ` Darrick J. Wong
2020-05-05 10:44 ` Christoph Hellwig
2020-05-01 22:56 ` Ritesh Harjani
2020-04-27 18:19 ` [PATCH 11/11] ext4: remove the access_ok() check in ext4_ioctl_get_es_cache Christoph Hellwig
2020-05-01 22:56 ` Ritesh Harjani
2020-05-05 15:43 fix fiemap for ext4 bitmap files (+ cleanups) v3 Christoph Hellwig
2020-05-05 15:43 ` [PATCH 06/11] fs: move the fiemap definitions out of fs.h Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200501232322.9073AAE04D@d06av26.portsmouth.uk.ibm.com \
--to=riteshh@linux.ibm.com \
--cc=adilger@dilger.ca \
--cc=amir73il@gmail.com \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.