|
|
@@ -731,8 +731,7 @@ int cfs_tracefile_dump_all_pages(char *filename)
|
|
|
__LASSERT_TAGE_INVARIANT(tage);
|
|
|
|
|
|
buf = kmap(tage->page);
|
|
|
- rc = vfs_write(filp, (__force const char __user *)buf,
|
|
|
- tage->used, &filp->f_pos);
|
|
|
+ rc = kernel_write(filp, buf, tage->used, &filp->f_pos);
|
|
|
kunmap(tage->page);
|
|
|
|
|
|
if (rc != (int)tage->used) {
|
|
|
@@ -976,7 +975,6 @@ static int tracefiled(void *arg)
|
|
|
struct tracefiled_ctl *tctl = arg;
|
|
|
struct cfs_trace_page *tage;
|
|
|
struct cfs_trace_page *tmp;
|
|
|
- mm_segment_t __oldfs;
|
|
|
struct file *filp;
|
|
|
char *buf;
|
|
|
int last_loop = 0;
|
|
|
@@ -1014,8 +1012,6 @@ static int tracefiled(void *arg)
|
|
|
__LASSERT(list_empty(&pc.pc_pages));
|
|
|
goto end_loop;
|
|
|
}
|
|
|
- __oldfs = get_fs();
|
|
|
- set_fs(get_ds());
|
|
|
|
|
|
list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) {
|
|
|
static loff_t f_pos;
|
|
|
@@ -1028,8 +1024,7 @@ static int tracefiled(void *arg)
|
|
|
f_pos = i_size_read(file_inode(filp));
|
|
|
|
|
|
buf = kmap(tage->page);
|
|
|
- rc = vfs_write(filp, (__force const char __user *)buf,
|
|
|
- tage->used, &f_pos);
|
|
|
+ rc = kernel_write(filp, buf, tage->used, &f_pos);
|
|
|
kunmap(tage->page);
|
|
|
|
|
|
if (rc != (int)tage->used) {
|
|
|
@@ -1040,7 +1035,6 @@ static int tracefiled(void *arg)
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- set_fs(__oldfs);
|
|
|
|
|
|
filp_close(filp, NULL);
|
|
|
put_pages_on_daemon_list(&pc);
|