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

lustre: switch to kernel_write

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

authored by

Christoph Hellwig and committed by
Al Viro 82577239 05a4a33b

+3 -14
unified split
+2 -8
drivers/staging/lustre/lnet/libcfs/tracefile.c
··· 731 731 __LASSERT_TAGE_INVARIANT(tage); 732 732 733 733 buf = kmap(tage->page); 734 - rc = vfs_write(filp, (__force const char __user *)buf, 735 - tage->used, &filp->f_pos); 734 + rc = kernel_write(filp, buf, tage->used, &filp->f_pos); 736 735 kunmap(tage->page); 737 736 738 737 if (rc != (int)tage->used) { ··· 975 976 struct tracefiled_ctl *tctl = arg; 976 977 struct cfs_trace_page *tage; 977 978 struct cfs_trace_page *tmp; 978 - mm_segment_t __oldfs; 979 979 struct file *filp; 980 980 char *buf; 981 981 int last_loop = 0; ··· 1012 1014 __LASSERT(list_empty(&pc.pc_pages)); 1013 1015 goto end_loop; 1014 1016 } 1015 - __oldfs = get_fs(); 1016 - set_fs(get_ds()); 1017 1017 1018 1018 list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { 1019 1019 static loff_t f_pos; ··· 1024 1028 f_pos = i_size_read(file_inode(filp)); 1025 1029 1026 1030 buf = kmap(tage->page); 1027 - rc = vfs_write(filp, (__force const char __user *)buf, 1028 - tage->used, &f_pos); 1031 + rc = kernel_write(filp, buf, tage->used, &f_pos); 1029 1032 kunmap(tage->page); 1030 1033 1031 1034 if (rc != (int)tage->used) { ··· 1035 1040 break; 1036 1041 } 1037 1042 } 1038 - set_fs(__oldfs); 1039 1043 1040 1044 filp_close(filp, NULL); 1041 1045 put_pages_on_daemon_list(&pc);
+1 -6
drivers/staging/lustre/lustre/obdclass/kernelcomm.c
··· 52 52 struct kuc_hdr *kuch = (struct kuc_hdr *)payload; 53 53 ssize_t count = kuch->kuc_msglen; 54 54 loff_t offset = 0; 55 - mm_segment_t fs; 56 55 int rc = -ENXIO; 57 56 58 57 if (IS_ERR_OR_NULL(filp)) ··· 62 63 return rc; 63 64 } 64 65 65 - fs = get_fs(); 66 - set_fs(KERNEL_DS); 67 66 while (count > 0) { 68 - rc = vfs_write(filp, (void __force __user *)payload, 69 - count, &offset); 67 + rc = kernel_write(filp, payload, count, &offset); 70 68 if (rc < 0) 71 69 break; 72 70 count -= rc; 73 71 payload += rc; 74 72 rc = 0; 75 73 } 76 - set_fs(fs); 77 74 78 75 if (rc < 0) 79 76 CWARN("message send failed (%d)\n", rc);