Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (c4c53bad) · Commits · 戴 / test

Pull 9p regression fix from Al Viro: "Fix for breakage introduced when switching p9_client_{read,write}() to struct iov_iter * (went into 4.1)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: 9p: ensure err is initialized to 0 in p9_client_read/write

net/9p/client.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1541,6 +1541,7 @@ p9_client_read(struct p9_fid fid, u64 offset, struct iov_iter to, int *err)
		struct p9_client *clnt = fid->clnt;
		struct p9_req_t *req;
		int total = 0;
		*err = 0;

		p9_debug(P9_DEBUG_9P, ">>> TREAD fid %d offset %llu %d\n",
		fid->fid, (unsigned long long) offset, (int)iov_iter_count(to));
		@@ -1620,6 +1621,7 @@ p9_client_write(struct p9_fid fid, u64 offset, struct iov_iter from, int *err)
		struct p9_client *clnt = fid->clnt;
		struct p9_req_t *req;
		int total = 0;
		*err = 0;

		p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %zd\n",
		fid->fid, (unsigned long long) offset,

Admin message