Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <7d1499fadf42052711e39f0d8c7656f4d3a4bc9d.camel@redhat.com>
Subject: Re: [PATCH 08/11] cifs: Remove call to filemap_check_wb_err()
From:   Jeff Layton <jlayton@redhat.com>
To:     "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc:     linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Date:   Mon, 09 Jan 2023 09:42:36 -0500
In-Reply-To: <20230109051823.480289-9-willy@infradead.org>
References: <20230109051823.480289-1-willy@infradead.org>
         <20230109051823.480289-9-willy@infradead.org>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.2 (3.46.2-1.fc37) 
MIME-Version: 1.0
Precedence: bulk

On Mon, 2023-01-09 at 05:18 +0000, Matthew Wilcox (Oracle) wrote:
> filemap_write_and_wait() now calls filemap_check_wb_err(), so we cannot
> glean any additional information by calling it ourselves.  It may also
> be misleading as it will pick up on any errors since the beginning of
> time which may well be since before this program opened the file.
>=20
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>  fs/cifs/file.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>=20
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index 22dfc1f8b4f1..7e7ee26cf77d 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -3042,14 +3042,12 @@ int cifs_flush(struct file *file, fl_owner_t id)
>  	int rc =3D 0;
> =20
>  	if (file->f_mode & FMODE_WRITE)
> -		rc =3D filemap_write_and_wait(inode->i_mapping);
> +		rc =3D filemap_write_and_wait(file->f_mapping);

If we're calling ->flush, then the file is being closed. Should this
just be?
		rc =3D file_write_and_wait(file);

It's not like we need to worry about corrupting ->f_wb_err at that
point.

> =20
>  	cifs_dbg(FYI, "Flush inode %p file %p rc %d\n", inode, file rc);
> -	if (rc) {
> -		/* get more nuanced writeback errors */
> -		rc =3D filemap_check_wb_err(file->f_mapping, 0);
> +	if (rc)
>  		trace_cifs_flush_err(inode->i_ino, rc);
> -	}
> +
>  	return rc;
>  }
> =20

--=20
Jeff Layton <jlayton@redhat.com>