All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-fsdevel@vger.kernel.org, Milosz Tanski <milosz@adfin.com>,
	xfs@oss.sgi.com
Subject: Re: [PATCH 1/3] xfs: add RWF_NONBLOCK support
Date: Thu, 2 Oct 2014 08:23:27 +1000	[thread overview]
Message-ID: <20141001222327.GT4758@dastard> (raw)
In-Reply-To: <1412197494-7655-2-git-send-email-hch@lst.de>

On Wed, Oct 01, 2014 at 11:04:52PM +0200, Christoph Hellwig wrote:
> Add support for non-blocking reads.  The guts are handled by the generic
> code, the only addition is a non-blocking variant of xfs_rw_ilock.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/xfs/xfs_file.c | 30 +++++++++++++++++++++++++-----
>  1 file changed, 25 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index cf61271..f9efffc 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -61,6 +61,23 @@ xfs_rw_ilock(
>  	xfs_ilock(ip, type);
>  }
>  
> +static inline bool
> +xfs_rw_ilock_nowait(
> +	struct xfs_inode	*ip,
> +	int			type)
> +{
> +	if (type & XFS_IOLOCK_EXCL) {
> +		if (!mutex_trylock(&VFS_I(ip)->i_mutex))
> +			return false;
> +	}
> +	if (!xfs_ilock_nowait(ip, type)) {
> +		mutex_unlock(&VFS_I(ip)->i_mutex);

Shouldn't that be:

		if (type & XFS_IOLOCK_EXCL) {
			mutex_unlock(&VFS_I(ip)->i_mutex);

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

WARNING: multiple messages have this Message-ID (diff)
From: Dave Chinner <david@fromorbit.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Milosz Tanski <milosz@adfin.com>,
	linux-fsdevel@vger.kernel.org, xfs@oss.sgi.com
Subject: Re: [PATCH 1/3] xfs: add RWF_NONBLOCK support
Date: Thu, 2 Oct 2014 08:23:27 +1000	[thread overview]
Message-ID: <20141001222327.GT4758@dastard> (raw)
In-Reply-To: <1412197494-7655-2-git-send-email-hch@lst.de>

On Wed, Oct 01, 2014 at 11:04:52PM +0200, Christoph Hellwig wrote:
> Add support for non-blocking reads.  The guts are handled by the generic
> code, the only addition is a non-blocking variant of xfs_rw_ilock.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/xfs/xfs_file.c | 30 +++++++++++++++++++++++++-----
>  1 file changed, 25 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index cf61271..f9efffc 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -61,6 +61,23 @@ xfs_rw_ilock(
>  	xfs_ilock(ip, type);
>  }
>  
> +static inline bool
> +xfs_rw_ilock_nowait(
> +	struct xfs_inode	*ip,
> +	int			type)
> +{
> +	if (type & XFS_IOLOCK_EXCL) {
> +		if (!mutex_trylock(&VFS_I(ip)->i_mutex))
> +			return false;
> +	}
> +	if (!xfs_ilock_nowait(ip, type)) {
> +		mutex_unlock(&VFS_I(ip)->i_mutex);

Shouldn't that be:

		if (type & XFS_IOLOCK_EXCL) {
			mutex_unlock(&VFS_I(ip)->i_mutex);

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

  reply	other threads:[~2014-10-01 22:23 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-01 21:04 preadv2/pwritev2 updates Christoph Hellwig
2014-10-01 21:04 ` Christoph Hellwig
2014-10-01 21:04 ` [PATCH 1/3] xfs: add RWF_NONBLOCK support Christoph Hellwig
2014-10-01 21:04   ` Christoph Hellwig
2014-10-01 22:23   ` Dave Chinner [this message]
2014-10-01 22:23     ` Dave Chinner
2014-10-02 11:29     ` Christoph Hellwig
2014-10-02 11:29       ` Christoph Hellwig
2014-10-02 17:33   ` [PATCH 1/3 v2] " Christoph Hellwig
2014-10-01 21:04 ` [PATCH 2/3] fs: pass iocb to generic_write_sync Christoph Hellwig
2014-10-01 21:04   ` Christoph Hellwig
2014-10-01 21:04 ` [PATCH 3/3] fs: add a flag for per-operation O_DSYNC semantics Christoph Hellwig
2014-10-01 21:04   ` Christoph Hellwig
2014-10-01 22:26 ` preadv2/pwritev2 updates Dave Chinner
2014-10-01 22:26   ` Dave Chinner
2014-10-02 11:31   ` Christoph Hellwig
2014-10-02 11:31     ` Christoph Hellwig
2014-10-02 21:05     ` Dave Chinner
2014-10-02 21:05       ` Dave Chinner
2014-10-08  2:58 ` Milosz Tanski

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=20141001222327.GT4758@dastard \
    --to=david@fromorbit.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=milosz@adfin.com \
    --cc=xfs@oss.sgi.com \
    /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.