JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* syscalls.cc (unlink_nt): Ignore sharing violation on NFS. Align

Browse Source 
comments.
This commit is contained in:
Corinna Vinschen 2009-07-24 14:13:44 +00:00
parent 6922bae9a1
commit 92d816d492
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2009-07-24 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (unlink_nt): Ignore sharing violation on NFS. Align
comments.
2009-07-23 Corinna Vinschen <corinna@vinschen.de> 2009-07-23 Corinna Vinschen <corinna@vinschen.de>
* mount.h (fs_info::fsn): New member. * mount.h (fs_info::fsn): New member.

7
winsup/cygwin/syscalls.cc
View File

@ -500,8 +500,9 @@ unlink_nt (path_conv &pc)
though, and it is then possible to delete the file quite normally. */ though, and it is then possible to delete the file quite normally. */
/* The recycle bin is only accessible locally. For in-use remote /* The recycle bin is only accessible locally. For in-use remote
files we drop back to just returning EBUSY. */ files we drop back to just returning EBUSY, except for NFS. */
if (pc.isremote () && status == STATUS_SHARING_VIOLATION) if (pc.isremote () && status == STATUS_SHARING_VIOLATION
&& !pc.fs_is_nfs ())
{ {
if (fh_ro) if (fh_ro)
{ {
@ -511,7 +512,7 @@ unlink_nt (path_conv &pc)
} }
return status; return status;
} }
/* Only local FS and NFS w/ STATUS_LOCK_NOT_GRANTED should arrive here. */ /* Only local FS and NFS should arrive here. */
if (!pc.isremote ()) if (!pc.isremote ())
bin_stat = move_to_bin; bin_stat = move_to_bin;
if (!pc.isdir () || pc.isremote ()) if (!pc.isdir () || pc.isremote ())