Changeset 58195 in vbox for trunk/src/VBox/Additions/linux/sharedfolders/dirops.c
- Timestamp:
- Oct 12, 2015 3:13:47 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/linux/sharedfolders/dirops.c
r58143 r58195 63 63 ; 64 64 65 LogFunc(("sf_dir_open(): calling vboxCallCreate, folder %s, flags %#x\n",65 LogFunc(("sf_dir_open(): calling VbglR0SfCreate, folder %s, flags %#x\n", 66 66 sf_i->path->String.utf8, params.CreateFlags)); 67 rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, ¶ms);67 rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, ¶ms); 68 68 if (RT_SUCCESS(rc)) 69 69 { … … 77 77 err = -ENOENT; 78 78 79 rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);79 rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle); 80 80 if (RT_FAILURE(rc)) 81 LogFunc(("sf_dir_open(): vboxCallClose(%s) after err=%d failed rc=%Rrc\n",81 LogFunc(("sf_dir_open(): VbglR0SfClose(%s) after err=%d failed rc=%Rrc\n", 82 82 sf_i->path->String.utf8, err, rc)); 83 83 } … … 174 174 ; 175 175 176 LogFunc(("sf_getdent: calling vboxCallCreate, folder %s, flags %#x\n",176 LogFunc(("sf_getdent: calling VbglR0SfCreate, folder %s, flags %#x\n", 177 177 sf_i->path->String.utf8, params.CreateFlags)); 178 rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, ¶ms);178 rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, ¶ms); 179 179 if (RT_FAILURE(rc)) 180 180 { 181 LogFunc((" vboxCallCreate(%s) failed rc=%Rrc\n",181 LogFunc(("VbglR0SfCreate(%s) failed rc=%Rrc\n", 182 182 sf_i->path->String.utf8, rc)); 183 183 return -EPERM; … … 193 193 sf_dir_info_empty(sf_d); 194 194 err = sf_dir_read_all(sf_g, sf_i, sf_d, params.Handle); 195 rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);195 rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle); 196 196 if (RT_FAILURE(rc)) 197 LogFunc((" vboxCallClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));197 LogFunc(("VbglR0SfClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc)); 198 198 if (err) 199 199 return err; … … 562 562 params.Info.Attr.enmAdditional = RTFSOBJATTRADD_NOTHING; 563 563 564 LogFunc(("sf_create_aux: calling vboxCallCreate, folder %s, flags %#x\n",564 LogFunc(("sf_create_aux: calling VbglR0SfCreate, folder %s, flags %#x\n", 565 565 path->String.utf8, params.CreateFlags)); 566 rc = vboxCallCreate(&client_handle, &sf_g->map, path, ¶ms);566 rc = VbglR0SfCreate(&client_handle, &sf_g->map, path, ¶ms); 567 567 if (RT_FAILURE(rc)) 568 568 { … … 573 573 } 574 574 err = -EPROTO; 575 LogFunc(("(%d): vboxCallCreate(%s) failed rc=%Rrc\n",575 LogFunc(("(%d): VbglR0SfCreate(%s) failed rc=%Rrc\n", 576 576 fDirectory, sf_i->path->String.utf8, rc)); 577 577 goto fail1; … … 602 602 if (fDirectory) 603 603 { 604 rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);604 rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle); 605 605 if (RT_FAILURE(rc)) 606 LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", fDirectory, rc));606 LogFunc(("(%d): VbglR0SfClose failed rc=%Rrc\n", fDirectory, rc)); 607 607 } 608 608 … … 611 611 612 612 fail2: 613 rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);613 rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle); 614 614 if (RT_FAILURE(rc)) 615 LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", fDirectory, rc));615 LogFunc(("(%d): VbglR0SfClose failed rc=%Rrc\n", fDirectory, rc)); 616 616 617 617 fail1: … … 691 691 && ((dentry->d_inode->i_mode & S_IFLNK) == S_IFLNK)) 692 692 fFlags |= SHFL_REMOVE_SYMLINK; 693 rc = vboxCallRemove(&client_handle, &sf_g->map, path, fFlags);693 rc = VbglR0SfRemove(&client_handle, &sf_g->map, path, fFlags); 694 694 if (RT_FAILURE(rc)) 695 695 { 696 LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Rrc\n", fDirectory, 697 path->String.utf8, rc)); 696 LogFunc(("(%d): VbglR0SfRemove(%s) failed rc=%Rrc\n", fDirectory, path->String.utf8, rc)); 698 697 err = -RTErrConvertToErrno(rc); 699 698 goto fail1; … … 785 784 int fDir = ((old_dentry->d_inode->i_mode & S_IFDIR) != 0); 786 785 787 rc = vboxCallRename(&client_handle, &sf_g->map, old_path,786 rc = VbglR0SfRename(&client_handle, &sf_g->map, old_path, 788 787 new_path, fDir ? 0 : SHFL_RENAME_FILE | SHFL_RENAME_REPLACE_IF_EXISTS); 789 788 if (RT_SUCCESS(rc)) … … 797 796 else 798 797 { 799 LogFunc((" vboxCallRename failed rc=%Rrc\n", rc));798 LogFunc(("VbglR0SfRename failed rc=%Rrc\n", rc)); 800 799 err = -RTErrConvertToErrno(rc); 801 800 kfree(new_path); … … 840 839 memcpy(ssymname->String.utf8, symname, symname_len); 841 840 842 rc = vboxCallSymlink(&client_handle, &sf_g->map, path, ssymname, &info);841 rc = VbglR0SfSymlink(&client_handle, &sf_g->map, path, ssymname, &info); 843 842 kfree(ssymname); 844 843 … … 850 849 goto fail1; 851 850 } 852 LogFunc((" vboxCallSymlink(%s) failed rc=%Rrc\n",851 LogFunc(("VbglR0SfSymlink(%s) failed rc=%Rrc\n", 853 852 sf_i->path->String.utf8, rc)); 854 853 err = -EPROTO;
Note:
See TracChangeset
for help on using the changeset viewer.