xfs
[Top] [All Lists]

Re: [PATCH 8/7] xfs: remove SYNC_IOWAIT

To: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Subject: Re: [PATCH 8/7] xfs: remove SYNC_IOWAIT
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Fri, 05 Jun 2009 15:37:22 -0500
Cc: xfs@xxxxxxxxxxx
In-reply-to: <20090528121915.GA30037@xxxxxxxxxxxxx>
References: <20090514171233.942489000@xxxxxxxxxxxxxxxxxxxxxx> <20090528121915.GA30037@xxxxxxxxxxxxx>
User-agent: Thunderbird 2.0.0.21 (X11/20090320)
Christoph Hellwig wrote:
> We want to wait for all I/O to finish when we do data integrity syncs.  So
> there is no reason to keep SYNC_WAIT separate from SYNC_IOWAIT.  This
> causes a little change in behaviour for the ENOSPC flushing code which no
> does a second submission and wait of buffered I/O, but that should finish
> ASAP as we already did an asynchronous writeout earlier.
> 
> 
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Seems ok to me.

Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxxx>

> Index: xfs/fs/xfs/linux-2.6/xfs_sync.c
> ===================================================================
> --- xfs.orig/fs/xfs/linux-2.6/xfs_sync.c      2009-05-27 12:59:57.115813662 
> +0200
> +++ xfs/fs/xfs/linux-2.6/xfs_sync.c   2009-05-27 13:01:14.634816358 +0200
> @@ -226,7 +226,7 @@ xfs_sync_inode_data(
>       xfs_iunlock(ip, XFS_IOLOCK_SHARED);
>  
>   out_wait:
> -     if (flags & SYNC_IOWAIT)
> +     if (flags & SYNC_WAIT)
>               xfs_ioend_wait(ip);
>       IRELE(ip);
>       return error;
> @@ -277,7 +277,7 @@ xfs_sync_data(
>  {
>       int                     error;
>  
> -     ASSERT((flags & ~(SYNC_TRYLOCK|SYNC_WAIT|SYNC_IOWAIT)) == 0);
> +     ASSERT((flags & ~(SYNC_TRYLOCK|SYNC_WAIT)) == 0);
>  
>       error = xfs_inode_ag_iterator(mp, xfs_sync_inode_data, flags, -1);
>       if (error)
> @@ -419,7 +419,7 @@ xfs_quiesce_data(
>       xfs_filestream_flush(mp);
>  
>       /* push and block */
> -     xfs_sync_data(mp, SYNC_WAIT|SYNC_IOWAIT);
> +     xfs_sync_data(mp, SYNC_WAIT);
>       xfs_qm_sync(mp, SYNC_WAIT);
>  
>       /* write superblock and hoover up shutdown errors */
> @@ -532,7 +532,7 @@ xfs_flush_inodes_work(
>  {
>       struct inode    *inode = arg;
>       xfs_sync_data(mp, SYNC_TRYLOCK);
> -     xfs_sync_data(mp, SYNC_TRYLOCK | SYNC_IOWAIT);
> +     xfs_sync_data(mp, SYNC_TRYLOCK | SYNC_WAIT);
>       iput(inode);
>  }
>  
> Index: xfs/fs/xfs/linux-2.6/xfs_sync.h
> ===================================================================
> --- xfs.orig/fs/xfs/linux-2.6/xfs_sync.h      2009-05-27 13:00:29.045814647 
> +0200
> +++ xfs/fs/xfs/linux-2.6/xfs_sync.h   2009-05-27 13:01:39.162941539 +0200
> @@ -31,7 +31,6 @@ typedef struct xfs_sync_work {
>  
>  #define SYNC_WAIT            0x0004  /* wait for i/o to complete */
>  #define SYNC_BDFLUSH         0x0008  /* BDFLUSH is calling -- don't block */
> -#define SYNC_IOWAIT          0x0010  /* wait for all I/O to complete */
>  #define SYNC_TRYLOCK         0x0020  /* only try to lock inodes */
>  
>  int xfs_syncd_init(struct xfs_mount *mp);
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
> 

<Prev in Thread] Current Thread [Next in Thread>