Unified · Split
| @@ -466,7 +466,7 @@ _9pclunk(FFid *f) · 465 unmodified lines | |||
| 466 | { | 466 | { |
| 467 | Fcall tclunk, rclunk; | 467 | Fcall tclunk, rclunk; |
| 468 | 468 | ||
| 469 | if(f == NULL) | 469 | if(f == NULL || f == rootfid) |
| 470 | return 0; | 470 | return 0; |
| 471 | tclunk.type = Tclunk; | 471 | tclunk.type = Tclunk; |
| 472 | tclunk.fid = f->fid; | 472 | tclunk.fid = f->fid; |
| @@ -511,7 +511,7 @@ lookupfid(u32int fid, int act) · 38 unmodified lines | |||
| 511 | break; | 511 | break; |
| 512 | case DEL: | 512 | case DEL: |
| 513 | if(*floc == NULL || *floc == rootfid) | 513 | if(*floc == NULL || *floc == rootfid) |
| 514 | return NULL; | 514 | return FDEL; |
| 515 | f = *floc; | 515 | f = *floc; |
| 516 | *floc = f->link; | 516 | *floc = f->link; |
| 517 | free(f->path); | 517 | free(f->path); |
| @@ -94,9 +94,9 @@ fsreleasedir(const char *path, struct fuse_file_info *ffi) · 93 unmodified lines | |||
| 94 | { | 94 | { |
| 95 | FFid *f; | 95 | FFid *f; |
| 96 | 96 | ||
| 97 | if((FFid*)ffi->fh == NULL) | ||
| 98 | return 0; | ||
| 99 | f = (FFid*)ffi->fh; | 97 | f = (FFid*)ffi->fh; |
| 98 | if(f == NULL || f == rootfid) | ||
| 99 | return 0; | ||
| 100 | if((f->qid.type & QTDIR) == 0) | 100 | if((f->qid.type & QTDIR) == 0) |
| 101 | return -ENOTDIR; | 101 | return -ENOTDIR; |
| 102 | return _9pclunk(f); | 102 | return _9pclunk(f); |