From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:53398 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754154AbdCOVvd (ORCPT ); Wed, 15 Mar 2017 17:51:33 -0400 From: Goldwyn Rodrigues To: linux-fsdevel@vger.kernel.org Cc: jack@suse.com, hch@infradead.org, linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, sagi@grimberg.me, avi@scylladb.com, axboe@kernel.dk, linux-api@vger.kernel.org, willy@infradead.org, Goldwyn Rodrigues Subject: [PATCH 2/8] nowait aio: Return if cannot get hold of i_rwsem Date: Wed, 15 Mar 2017 16:51:01 -0500 Message-Id: <20170315215107.5628-3-rgoldwyn@suse.de> In-Reply-To: <20170315215107.5628-1-rgoldwyn@suse.de> References: <20170315215107.5628-1-rgoldwyn@suse.de> Sender: linux-btrfs-owner@vger.kernel.org List-ID: From: Goldwyn Rodrigues A failure to lock i_rwsem would mean there is I/O being performed by another thread. So, let's bail. Reviewed-by: Christoph Hellwig Signed-off-by: Goldwyn Rodrigues --- mm/filemap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index 1694623..e08f3b9 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2982,7 +2982,12 @@ ssize_t generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from) struct inode *inode = file->f_mapping->host; ssize_t ret; - inode_lock(inode); + if (!inode_trylock(inode)) { + /* Don't sleep on inode rwsem */ + if (iocb->ki_flags & IOCB_NOWAIT) + return -EAGAIN; + inode_lock(inode); + } ret = generic_write_checks(iocb, from); if (ret > 0) ret = __generic_file_write_iter(iocb, from); -- 2.10.2