lib-fs: Replace i_error() calls with e_error()

diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c
index 1580daae890cd283b516114e1c3b6fcc7b03dae5..f0283d845778731d99a57ab9bce69f586a9f0d22 100644 (file)
--- a/src/lib-fs/fs-posix.c
+++ b/src/lib-fs/fs-posix.c
@@ -398,7 +398,7 @@ static bool fs_posix_prefetch(struct fs_file *_file, uoff_t length ATTR_UNUSED)
 /* HAVE_POSIX_FADVISE alone isn't enough for CentOS 4.9 */
 #if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
        if (posix_fadvise(file->fd, 0, length, POSIX_FADV_WILLNEED) < 0) {
-               i_error("posix_fadvise(%s) failed: %m", file->full_path);
+               e_error(_file->event, "posix_fadvise(%s) failed: %m", file->full_path);
                return TRUE;
        }
 #endif

diff --git a/src/lib-fs/fs-sis-common.c b/src/lib-fs/fs-sis-common.c
index 06d1bcdf718831a388847f704a4a381c01000946..75791c0be26e67a9df25057b7b21efce5d610566 100644 (file)
--- a/src/lib-fs/fs-sis-common.c
+++ b/src/lib-fs/fs-sis-common.c
@@ -47,8 +47,10 @@ void fs_sis_try_unlink_hash_file(struct fs *sis_fs, struct fs_file *super_file)
                if (fs_stat(hash_file, &st2) == 0 &&
                    st1.st_ino == st2.st_ino &&
                    CMP_DEV_T(st1.st_dev, st2.st_dev)) {
-                       if (fs_delete(hash_file) < 0)
-                               i_error("%s", fs_last_error(hash_file->fs));
+                       if (fs_delete(hash_file) < 0) {
+                               e_error(hash_file->event, "%s",
+                                       fs_last_error(hash_file->fs));
+                       }
                }
                fs_file_deinit(&hash_file);
        }

diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index 77b5778aa8e0da1f2b441e9ea16dab432c1980ab..9fa536d215eccbb393496ef21bfb92013f03a15c 100644 (file)
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -115,7 +115,7 @@ static void fs_sis_queue_add(struct sis_queue_fs_file *file)
        queue_path = t_strdup_printf("%s/%s", fs->queue_dir, fname);
        queue_file = fs_file_init_parent(&file->file, queue_path, FS_OPEN_MODE_CREATE);
        if (fs_write(queue_file, "", 0) < 0 && errno != EEXIST)
-               i_error("fs-sis-queue: %s", fs_file_last_error(queue_file));
+               e_error(file->file.event, "%s", fs_file_last_error(queue_file));
        fs_file_deinit(&queue_file);
 }
 

diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index 654db3032759c3814caacc335e226c9ec13d12a6..226d3cab46eadb0e14be636ceac89036d3af38d2 100644 (file)
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -113,7 +113,7 @@ fs_sis_file_init(struct fs_file *_file, const char *path,
        if (i_stream_read(file->hash_input) == -1) {
                /* doesn't exist */
                if (errno != ENOENT) {
-                       i_error("fs-sis: Couldn't read hash file %s: %m",
+                       e_error(file->file.event, "Couldn't read hash file %s: %m",
                                file->hash_path);
                }
                i_stream_destroy(&file->hash_input);
@@ -153,21 +153,28 @@ static bool fs_sis_try_link(struct sis_fs_file *file)
 
        /* we can use the existing file */
        if (fs_copy(file->hash_file, file->file.parent) < 0) {
-               if (errno != ENOENT && errno != EMLINK)
-                       i_error("fs-sis: %s", fs_file_last_error(file->hash_file));
+               if (errno != ENOENT && errno != EMLINK) {
+                       e_error(file->file.event, "%s",
+                               fs_file_last_error(file->hash_file));
+               }
                /* failed to use link(), continue as if it hadn't been equal */
                return FALSE;
        }
        if (fs_stat(file->file.parent, &st2) < 0) {
-               i_error("fs-sis: %s", fs_file_last_error(file->file.parent));
-               if (fs_delete(file->file.parent) < 0)
-                       i_error("fs-sis: %s", fs_file_last_error(file->file.parent));
+               e_error(file->file.event, "%s",
+                       fs_file_last_error(file->file.parent));
+               if (fs_delete(file->file.parent) < 0) {
+                       e_error(file->file.event, "%s",
+                               fs_file_last_error(file->file.parent));
+               }
                return FALSE;
        }
        if (st->st_ino != st2.st_ino) {
                /* the hashes/ file was already replaced with something else */
-               if (fs_delete(file->file.parent) < 0)
-                       i_error("fs-sis: %s", fs_file_last_error(file->file.parent));
+               if (fs_delete(file->file.parent) < 0) {
+                       e_error(file->file.event, "%s",
+                               fs_file_last_error(file->file.parent));
+               }
                return FALSE;
        }
        return TRUE;
@@ -190,7 +197,8 @@ static void fs_sis_replace_hash_file(struct sis_fs_file *file)
                                   a duplicate, but it's too much trouble
                                   trying to deduplicate it anymore */
                        } else {
-                               i_error("fs-sis: %s", fs_last_error(super_fs));
+                               e_error(file->file.event, "%s",
+                                       fs_last_error(super_fs));
                        }
                }
                return;
@@ -217,11 +225,11 @@ static void fs_sis_replace_hash_file(struct sis_fs_file *file)
                   try to continue. */
                if (fs_delete(temp_file) < 0 &&
                    errno != ENOENT)
-                       i_error("fs-sis: %s", fs_last_error(super_fs));
+                       e_error(file->file.event, "%s", fs_last_error(super_fs));
                ret = fs_copy(file->file.parent, temp_file);
        }
        if (ret < 0) {
-               i_error("fs-sis: %s", fs_last_error(super_fs));
+               e_error(file->file.event, "%s", fs_last_error(super_fs));
                fs_file_deinit(&temp_file);
                return;
        }
@@ -230,7 +238,7 @@ static void fs_sis_replace_hash_file(struct sis_fs_file *file)
                if (errno == ENOENT) {
                        /* apparently someone else just renamed it. ignore. */
                } else {
-                       i_error("fs-sis: %s", fs_last_error(super_fs));
+                       e_error(file->file.event, "%s", fs_last_error(super_fs));
                }
                (void)fs_delete(temp_file);
        }