Merge tag 'nfs-for-5.0-3' of git://git.linux-nfs.org/projects/anna/linux-nfs (937108b0) · Commits · 戴 / test

fs/nfs/super.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1895,6 +1895,11 @@ static int nfs_parse_devname(const char *dev_name,
		size_t len;
		char *end;

		if (unlikely(!dev_name \|\| !*dev_name)) {
		dfprintk(MOUNT, "NFS: device name not specified\n");
		return -EINVAL;
		}

		/* Is the host name protected with square brakcets? */
		if (*dev_name == '[') {
		end = strchr(++dev_name, ']');

+5 −4

Original line number	Diff line number	Diff line
		@@ -621,11 +621,12 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
		nfs_set_page_writeback(page);
		WARN_ON_ONCE(test_bit(PG_CLEAN, &req->wb_flags));

		ret = 0;
		ret = req->wb_context->error;
		/* If there is a fatal error that covers this write, just exit */
		if (nfs_error_is_fatal_on_server(req->wb_context->error))
		if (nfs_error_is_fatal_on_server(ret))
		goto out_launder;

		ret = 0;
		if (!nfs_pageio_add_request(pgio, req)) {
		ret = pgio->pg_error;
		/*
		@@ -635,9 +636,9 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
		nfs_context_set_write_error(req->wb_context, ret);
		if (nfs_error_is_fatal_on_server(ret))
		goto out_launder;
		}
		nfs_redirty_request(req);
		} else
		ret = -EAGAIN;
		nfs_redirty_request(req);
		} else
		nfs_add_stats(page_file_mapping(page)->host,
		NFSIOS_WRITEPAGES, 1);