tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: Fix incorrect parameters to v9fs_file_readn.
9p: Possible regression in p9_client_stat
9p: default 9p transport module fix

Linus Torvalds 457f82ba eb872c15

+6 -9
+1 -1
fs/9p/vfs_addr.c
··· 57 57 buffer = kmap(page); 58 58 offset = page_offset(page); 59 59 60 - retval = v9fs_file_readn(filp, buffer, NULL, offset, PAGE_CACHE_SIZE); 60 + retval = v9fs_file_readn(filp, buffer, NULL, PAGE_CACHE_SIZE, offset); 61 61 if (retval < 0) 62 62 goto done; 63 63
+5 -8
net/9p/client.c
··· 117 117 } 118 118 } 119 119 120 - if (!clnt->trans_mod) 121 - clnt->trans_mod = v9fs_get_default_trans(); 122 - 123 120 kfree(options); 124 121 return ret; 125 122 } ··· 686 689 if (err < 0) 687 690 goto error; 688 691 692 + if (!clnt->trans_mod) 693 + clnt->trans_mod = v9fs_get_default_trans(); 694 + 689 695 if (clnt->trans_mod == NULL) { 690 696 err = -EPROTONOSUPPORT; 691 697 P9_DPRINTK(P9_DEBUG_ERROR, ··· 1098 1098 1099 1099 if (data) { 1100 1100 memmove(data, dataptr, count); 1101 - data += count; 1102 1101 } 1103 1102 1104 1103 if (udata) { ··· 1191 1192 1192 1193 err = p9pdu_readf(req->rc, clnt->dotu, "wS", &ignored, ret); 1193 1194 if (err) { 1194 - ret = ERR_PTR(err); 1195 1195 p9pdu_dump(1, req->rc); 1196 - goto free_and_error; 1196 + p9_free_req(clnt, req); 1197 + goto error; 1197 1198 } 1198 1199 1199 1200 P9_DPRINTK(P9_DEBUG_9P, ··· 1210 1211 p9_free_req(clnt, req); 1211 1212 return ret; 1212 1213 1213 - free_and_error: 1214 - p9_free_req(clnt, req); 1215 1214 error: 1216 1215 kfree(ret); 1217 1216 return ERR_PTR(err);