Commit d95b2665 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Do not report flush errors in nfs_write_end() 



If we do flush cached writebacks in nfs_write_end() due to the imminent
expiration of an RPCSEC_GSS session, then we should defer reporting any
resulting errors until the calls to file_check_and_advance_wb_err() in
nfs_file_write() and nfs_file_fsync().

Fixes: 6fbda89b ("NFS: Replace custom error reporting mechanism with generic one")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent e6005436

fs/nfs/file.c

+2 −5
Original line number Diff line number Diff line
@@ -386,11 +386,8 @@ static int nfs_write_end(struct file *file, struct address_space *mapping, 
		return status;

	NFS_I(mapping->host)->write_io += copied;



	if (nfs_ctx_key_to_expire(ctx, mapping->host)) {

		status = nfs_wb_all(mapping->host);

		if (status < 0)

			return status;

	}

	if (nfs_ctx_key_to_expire(ctx, mapping->host))

		nfs_wb_all(mapping->host);



	return copied;

}