Re: [PATCH v6 06/10] xfs: add XFS_IOC_FREE_EOFBLOCKS ioctl

Dave Chinner
2012-11-06T22:09:19Z

On Tue, Nov 06, 2012 at 09:50:43AM -0500, Brian Foster wrote:
> The XFS_IOC_FREE_EOFBLOCKS ioctl allows users to invoke an EOFBLOCKS
> scan. The xfs_eofblocks structure is defined to support the command
> parameters (scan mode).
>
> Signed-off-by: Brian Foster <bfoster@redhat.com>
> ---
> fs/xfs/xfs_fs.h | 17 +++++++++++++++++
> fs/xfs/xfs_icache.c | 10 +++++++---
> fs/xfs/xfs_icache.h | 2 +-
> fs/xfs/xfs_ioctl.c | 20 ++++++++++++++++++++
> 4 files changed, 45 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h
> index c13fed8..26ff43a 100644
> --- a/fs/xfs/xfs_fs.h
> +++ b/fs/xfs/xfs_fs.h
> @@ -339,6 +339,22 @@ typedef struct xfs_error_injection {
>
>
> /*
> + * Speculative preallocation trimming.
> + */
> +#define XFS_EOFBLOCKS_VERSION 1
> +struct xfs_eofblocks {
> + __u32 eof_version;
> + __u32 eof_flags;
> + __u64 pad[15];
> +};
> +
> +/* eof_flags values */
> +#define XFS_EOF_FLAGS_SYNC (1 << 0) /* sync/wait mode scan */
> +#define XFS_EOF_FLAGS_VALID \
> + (XFS_EOF_FLAGS_SYNC)
> +
> +
> +/*
> * The user-level Handle Request interface structure.
> */
> typedef struct xfs_fsop_handlereq {
> @@ -456,6 +472,7 @@ typedef struct xfs_handle {
> /* XFS_IOC_GETBIOSIZE ---- deprecated 47 */
> #define XFS_IOC_GETBMAPX _IOWR('X', 56, struct getbmap)
> #define XFS_IOC_ZERO_RANGE _IOW ('X', 57, struct xfs_flock64)
> +#define XFS_IOC_FREE_EOFBLOCKS _IOR ('X', 58, struct xfs_eofblocks)
>
> /*
> * ioctl commands that replace IRIX syssgi()'s
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index b02a3df..d0d9273 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -1206,11 +1206,15 @@ xfs_inode_free_eofblocks(
> int
> xfs_icache_free_eofblocks(
> struct xfs_mount *mp,
> - int flags)
> + struct xfs_eofblocks *eofb)
> {
> - ASSERT((flags & ~(SYNC_TRYLOCK|SYNC_WAIT)) == 0);
> + int flags = SYNC_TRYLOCK;
> +
> + if (eofb && eofb->eof_flags & XFS_EOF_FLAGS_SYNC)

gcc will throw a warning about that.

if (eofb && (eofb->eof_flags & XFS_EOF_FLAGS_SYNC))

Apart from that, looks good.

Reviewed-by: Dave Chinner <dchinner@redhat.com>

--
Dave Chinner
david@fromorbit.com