LU-6142 mdd: Fix style issues for mdd_object.c

[fs/lustre-release.git] / lustre / utils / liblustreapi_mirror.c

diff --git a/lustre/utils/liblustreapi_mirror.c b/lustre/utils/liblustreapi_mirror.c
index a67629d..36e02fe 100644 (file)
--- a/lustre/utils/liblustreapi_mirror.c
+++ b/lustre/utils/liblustreapi_mirror.c
@@ -113,10 +113,16 @@ int llapi_mirror_clear(int fd)
 ssize_t llapi_mirror_read(int fd, unsigned int id, void *buf, size_t count,
                          off_t pos)
 {
-       size_t page_size = sysconf(_SC_PAGESIZE);
        ssize_t result = 0;
+       ssize_t page_size;
        int rc;
 
+       page_size = sysconf(_SC_PAGESIZE);
+       if (page_size < 0) {
+               rc = -errno;
+               return rc;
+       }
+
        rc = llapi_mirror_set(fd, id);
        if (rc < 0)
                return rc;
@@ -150,10 +156,14 @@ ssize_t llapi_mirror_read(int fd, unsigned int id, void *buf, size_t count,
 ssize_t llapi_mirror_write(int fd, unsigned int id, const void *buf,
                           size_t count, off_t pos)
 {
-       size_t page_size = sysconf(_SC_PAGESIZE);
        ssize_t result = 0;
+       ssize_t page_size;
        int rc;
 
+       page_size = sysconf(_SC_PAGESIZE);
+       if (page_size < 0)
+               return -EINVAL;
+
        if (((unsigned long)buf & (page_size - 1)) || pos & (page_size - 1))
                return -EINVAL;
 
@@ -203,6 +213,20 @@ int llapi_mirror_truncate(int fd, unsigned int id, off_t length)
        return rc;
 }
 
+int llapi_mirror_punch(int fd, unsigned int id, off_t start, size_t length)
+{
+       int rc;
+
+       rc = llapi_mirror_set(fd, id);
+       if (rc < 0)
+               return rc;
+
+       rc = llapi_hole_punch(fd, start, length);
+       (void) llapi_mirror_clear(fd);
+
+       return rc;
+}
+
 bool llapi_mirror_is_sparse(int fd, unsigned int id)
 {
        bool sparse;
@@ -264,7 +288,7 @@ ssize_t llapi_mirror_copy_many(int fd, __u16 src, __u16 *dst, size_t count)
        void *buf;
        off_t pos = 0;
        off_t data_end = 0;
-       size_t page_size = sysconf(_SC_PAGESIZE);
+       ssize_t page_size;
        ssize_t result = 0;
        bool eof = false;
        bool sparse;
@@ -275,6 +299,12 @@ ssize_t llapi_mirror_copy_many(int fd, __u16 src, __u16 *dst, size_t count)
        if (!count)
                return 0;
 
+       page_size = sysconf(_SC_PAGESIZE);
+       if (page_size < 0) {
+               rc = -errno;
+               return rc;
+       }
+
        rc = posix_memalign(&buf, page_size, buflen);
        if (rc) /* error code is returned directly */
                return -rc;
@@ -296,8 +326,10 @@ ssize_t llapi_mirror_copy_many(int fd, __u16 src, __u16 *dst, size_t count)
                                continue;
                        }
                }
-               if (!nr)
+               if (!nr) {
+                       free(buf);
                        return result;
+               }
        }
 
        while (!eof) {
@@ -401,14 +433,18 @@ int llapi_mirror_copy(int fd, unsigned int src, unsigned int dst, off_t pos,
                      size_t count)
 {
        const size_t buflen = 4 * 1024 * 1024; /* 4M */
-       void *buf;
-       size_t page_size = sysconf(_SC_PAGESIZE);
        ssize_t result = 0;
+       ssize_t page_size;
+       void *buf;
        int rc;
 
        if (!count)
                return 0;
 
+       page_size = sysconf(_SC_PAGESIZE);
+       if (page_size < 0)
+               return -EINVAL;
+
        if (pos & (page_size - 1) || !dst)
                return -EINVAL;