On Fri, Mar 26, 2021 at 01:53:19PM +0100, Anthony Iliopoulos wrote:
> Use of the flag has had no effect since kernel commit 288699fecaff
> ("xfs: drop dmapi hooks"), which removed all dmapi related code, so
> drop it completely.
>
> Signed-off-by: Anthony Iliopoulos <ailiop@xxxxxxxx>
> ---
> fs/xfs/libxfs/xfs_fs.h | 3 +--
> fs/xfs/xfs_ioctl.c | 2 --
> 2 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
> index 6fad140d4c8e..23da047c3098 100644
> --- a/fs/xfs/libxfs/xfs_fs.h
> +++ b/fs/xfs/libxfs/xfs_fs.h
> @@ -65,13 +65,12 @@ struct getbmapx {
>
> /* bmv_iflags values - set by XFS_IOC_GETBMAPX caller. */
> #define BMV_IF_ATTRFORK 0x1 /* return attr fork rather than data */
> -#define BMV_IF_NO_DMAPI_READ 0x2 /* Do not generate DMAPI read event */
I don't think we can drop this definition completely. Something has to
be here to discourage anyone from reusing 0x2, since there are
undoubtedly programs out there that will check for this. It's also not
a good idea to break kabi by removing names.
#define BMV_IF_NO_DMAPI_READ 0x2 /* Deprecated */
(Everything else in the patch looks fine.)
--D
> #define BMV_IF_PREALLOC 0x4 /* rtn status BMV_OF_PREALLOC if req */
> #define BMV_IF_DELALLOC 0x8 /* rtn status BMV_OF_DELALLOC if req */
> #define BMV_IF_NO_HOLES 0x10 /* Do not return holes */
> #define BMV_IF_COWFORK 0x20 /* return CoW fork rather than data */
> #define BMV_IF_VALID \
> - (BMV_IF_ATTRFORK|BMV_IF_NO_DMAPI_READ|BMV_IF_PREALLOC| \
> + (BMV_IF_ATTRFORK|BMV_IF_PREALLOC| \
> BMV_IF_DELALLOC|BMV_IF_NO_HOLES|BMV_IF_COWFORK)
>
> /* bmv_oflags values - returned for each non-header segment */
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 99dfe89a8d08..9d3f72ef1efe 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1669,8 +1669,6 @@ xfs_ioc_getbmap(
> bmx.bmv_iflags = BMV_IF_ATTRFORK;
> /*FALLTHRU*/
> case XFS_IOC_GETBMAP:
> - if (file->f_mode & FMODE_NOCMTIME)
> - bmx.bmv_iflags |= BMV_IF_NO_DMAPI_READ;
> /* struct getbmap is a strict subset of struct getbmapx. */
> recsize = sizeof(struct getbmap);
> break;
> --
> 2.31.0
>
