Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1170000AbdDXRQo (ORCPT ); Mon, 24 Apr 2017 13:16:44 -0400 Received: from mail-qt0-f175.google.com ([209.85.216.175]:36806 "EHLO mail-qt0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S975748AbdDXRQa (ORCPT ); Mon, 24 Apr 2017 13:16:30 -0400 Message-ID: <1493054187.2895.18.camel@redhat.com> Subject: Re: [PATCH v3 11/20] cifs: set mapping error when page writeback fails in writepage or launder_pages From: Jeff Layton To: Christoph Hellwig Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-cifs@vger.kernel.org, linux-mm@kvack.org, jfs-discussion@lists.sourceforge.net, linux-xfs@vger.kernel.org, cluster-devel@redhat.com, linux-f2fs-devel@lists.sourceforge.net, v9fs-developer@lists.sourceforge.net, osd-dev@open-osd.org, linux-nilfs@vger.kernel.org, linux-block@vger.kernel.org, dhowells@redhat.com, akpm@linux-foundation.org, ross.zwisler@linux.intel.com, mawilcox@microsoft.com, jack@suse.com, viro@zeniv.linux.org.uk, corbet@lwn.net, neilb@suse.de, clm@fb.com, tytso@mit.edu, axboe@kernel.dk Date: Mon, 24 Apr 2017 13:16:27 -0400 In-Reply-To: <20170424152708.GK9112@infradead.org> References: <20170424132259.8680-1-jlayton@redhat.com> <20170424132259.8680-12-jlayton@redhat.com> <20170424152708.GK9112@infradead.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6 (3.22.6-2.fc25) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1553 Lines: 49 On Mon, 2017-04-24 at 08:27 -0700, Christoph Hellwig wrote: > On Mon, Apr 24, 2017 at 09:22:50AM -0400, Jeff Layton wrote: > > Signed-off-by: Jeff Layton > > --- > > fs/cifs/file.c | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/fs/cifs/file.c b/fs/cifs/file.c > > index 21d404535739..4b696a23b0b1 100644 > > --- a/fs/cifs/file.c > > +++ b/fs/cifs/file.c > > @@ -2234,14 +2234,16 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc) > > set_page_writeback(page); > > retry_write: > > rc = cifs_partialpagewrite(page, 0, PAGE_SIZE); > > + if (rc == -EAGAIN && wbc->sync_mode == WB_SYNC_ALL) { > > goto retry_write; > > + } else if (rc == -EAGAIN) { > > redirty_page_for_writepage(wbc, page); > > + } else if (rc != 0) { > > SetPageError(page); > > + mapping_set_error(page->mapping, rc); > > + } else { > > SetPageUptodate(page); > > + } > > Hmmm. I might be a little too nitpicky, but I hate having the same > partial condition duplicated if possible. Why not: > > if (rc == -EAGAIN) { > if (wbc->sync_mode == WB_SYNC_ALL) > goto retry_write; > redirty_page_for_writepage(wbc, page); > } else if (rc) { > SetPageError(page); > mapping_set_error(page->mapping, rc); > } else { > SetPageUptodate(page); > } > > Otherwise this looks fine to me: > > Reviewed-by: Christoph Hellwig No, you're absolutely right. I merged that change into the patch. Thanks for the review so far! -- Jeff Layton