From: Timo Sirainen <tss@iki.fi>
Date: Thu, 12 Aug 2010 15:12:08 +0000 (+0100)
Subject: unlink_directory(): Don't log EBUSY error for unlink(.nfs*) directly.
X-Git-Tag: 2.0.rc6~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58b8f66566a205f4f7fe9e4d5e7bee6947274d39;p=thirdparty%2Fdovecot%2Fcore.git

unlink_directory(): Don't log EBUSY error for unlink(.nfs*) directly.
The caller can decide if it wants to log it.
---

diff --git a/src/lib/unlink-directory.c b/src/lib/unlink-directory.c
index 5dc3c74acf..89853e9898 100644
--- a/src/lib/unlink-directory.c
+++ b/src/lib/unlink-directory.c
@@ -126,6 +126,12 @@ static int unlink_directory_r(const char *dir)
 					}
 					errno = 0;
 				}
+			} else if (old_errno == EBUSY &&
+				   strncmp(d->d_name, ".nfs", 4) == 0) {
+				/* can't delete NFS files that are still
+				   in use. let the caller decide if this error
+				   is worth logging about */
+				break;
 			} else {
                                 /* so it wasn't a directory */
 				errno = old_errno;