hazza/rtl8189ES_linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #50 from sergey-suloev/master

Browse Source 
Use set_fs/get_fs pair only if declared
This commit is contained in:
Carlos Garcés
2021-01-10 19:51:47 +01:00
committed by GitHub
parent 930d3d7cfe 3f741cabeb
commit 249b65ba1d
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
os_dep/osdep_service.c
View File

@@ -1944,7 +1944,9 @@ static int isFileReadable(char *path)
{ {
struct file *fp; struct file *fp;
int ret = 0; int ret = 0;
#ifdef get_fs
mm_segment_t oldfs; mm_segment_t oldfs;
#endif
char buf; char buf;
fp=filp_open(path, O_RDONLY, 0); fp=filp_open(path, O_RDONLY, 0);
@@ -1952,12 +1954,15 @@ static int isFileReadable(char *path)
ret = PTR_ERR(fp); ret = PTR_ERR(fp);
} }
else { else {
oldfs = get_fs(); set_fs(KERNEL_DS); #ifdef get_fs
oldfs = get_fs();
set_fs(KERNEL_DS);
#endif
if(1!=readFile(fp, &buf, 1)) if(1!=readFile(fp, &buf, 1))
ret = PTR_ERR(fp); ret = PTR_ERR(fp);
#ifdef get_fs
set_fs(oldfs); set_fs(oldfs);
#endif
filp_close(fp,NULL); filp_close(fp,NULL);
} }
return ret; return ret;
@@ -1973,16 +1978,23 @@ static int isFileReadable(char *path)
static int retriveFromFile(char *path, u8* buf, u32 sz) static int retriveFromFile(char *path, u8* buf, u32 sz)
{ {
int ret =-1; int ret =-1;
#ifdef get_fs
mm_segment_t oldfs; mm_segment_t oldfs;
#endif
struct file *fp; struct file *fp;
if(path && buf) { if(path && buf) {
if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){ if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(KERNEL_DS); #ifdef get_fs
oldfs = get_fs();
set_fs(KERNEL_DS);
#endif
ret=readFile(fp, buf, sz); ret=readFile(fp, buf, sz);
#ifdef get_fs
set_fs(oldfs); set_fs(oldfs);
#endif
closeFile(fp); closeFile(fp);
DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret); DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret);
@@ -2007,16 +2019,23 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
static int storeToFile(char *path, u8* buf, u32 sz) static int storeToFile(char *path, u8* buf, u32 sz)
{ {
int ret =0; int ret =0;
#ifdef get_fs
mm_segment_t oldfs; mm_segment_t oldfs;
#endif
struct file *fp; struct file *fp;
if(path && buf) { if(path && buf) {
if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) { if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(KERNEL_DS); #ifdef get_fs
oldfs = get_fs();
set_fs(KERNEL_DS);
#endif
ret=writeFile(fp, buf, sz); ret=writeFile(fp, buf, sz);
#ifdef get_fs
set_fs(oldfs); set_fs(oldfs);
#endif
closeFile(fp); closeFile(fp);
DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret); DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret);