Merge branch 'product-2-2' of git://github.com/franklahm/Netatalk into alex-master

[netatalk.git] / libatalk / vfs / sys_ea.c

diff --git a/libatalk/vfs/sys_ea.c b/libatalk/vfs/sys_ea.c
index 900eb07e5591ce1e08ab4aeadbc633d575f2038a..6269f0a46d63145a972d0bfb29e0e576b83dd68a 100644 (file)
--- a/libatalk/vfs/sys_ea.c
+++ b/libatalk/vfs/sys_ea.c
@@ -707,7 +707,7 @@ static ssize_t solaris_list_xattr(int attrdirfd, char *list, size_t size)
        }
 
        if (closedir(dirp) == -1) {
-               LOG(log_debug, logtype_default, "closedir dirp failed: %s\n",strerror(errno));
+               LOG(log_error, logtype_default, "closedir dirp: %s",strerror(errno));
                return -1;
        }
        return len;
@@ -723,19 +723,15 @@ static int solaris_unlinkat(int attrdirfd, const char *name)
 
 static int solaris_attropen(const char *path, const char *attrpath, int oflag, mode_t mode)
 {
-       int filedes = attropen(path, attrpath, oflag, mode);
-       if (filedes == -1) {
-               LOG(log_maxdebug, logtype_default, "attropen FAILED: path: %s, name: %s, errno: %s\n",path,attrpath,strerror(errno));
-        errno = ENOATTR;
-       }
-       return filedes;
+       return attropen(path, attrpath, oflag, mode);
 }
 
 static int solaris_openat(int fildes, const char *path, int oflag, mode_t mode)
 {
        int filedes = openat(fildes, path, oflag, mode);
        if (filedes == -1) {
-               LOG(log_maxdebug, logtype_default, "openat FAILED: fd: %s, path: %s, errno: %s\n",filedes,path,strerror(errno));
+               LOG(log_error, logtype_default, "openat(\"%s\"): %s",
+            path, strerror(errno));
        }
        return filedes;
 }
@@ -745,7 +741,8 @@ static int solaris_write_xattr(int attrfd, const char *value, size_t size)
        if ((ftruncate(attrfd, 0) == 0) && (write(attrfd, value, size) == size)) {
                return 0;
        } else {
-               LOG(log_maxdebug, logtype_default, "solaris_write_xattr FAILED!\n");
+               LOG(log_error, logtype_default, "solaris_write_xattr: %s",
+            strerror(errno));
                return -1;
        }
 }