Merge remote-tracking branch 'origin/release-3.8' into merge-3.8

Change-Id: Ie6c73dee0b6798af4a69c43c0b03c3d02ff36aa2

3 files changed, 43 insertions, 1 deletions

diff --git a/libglusterfs/src/lkowner.h b/libglusterfs/src/lkowner.h
index b6a950f5e12..9712f176f30 100644
--- a/libglusterfs/src/lkowner.h
+++ b/libglusterfs/src/lkowner.h
@@ -84,4 +84,10 @@ out:
         return is_null;
 }
 
+static inline void
+lk_owner_copy (gf_lkowner_t *dst, gf_lkowner_t *src)
+{
+        dst->len = src->len;
+        memcpy(dst->data, src->data, src->len);
+}
 #endif /* _LK_OWNER_H */
diff --git a/libglusterfs/src/syscall.c b/libglusterfs/src/syscall.c
index 316d80452fb..7cf1c7757fe 100644
--- a/libglusterfs/src/syscall.c
+++ b/libglusterfs/src/syscall.c
@@ -309,7 +309,40 @@ sys_lseek (int fd, off_t offset, int whence)
 int
 sys_statvfs (const char *path, struct statvfs *buf)
 {
-        return statvfs (path, buf);
+        int ret;
+
+        ret = statvfs (path, buf);
+#ifdef __FreeBSD__
+        /* FreeBSD doesn't return the expected vaule in buf->f_bsize. It
+         * contains the optimal I/O size instead of the file system block
+         * size. Gluster expects that this field contains the block size.
+         */
+        if (ret == 0) {
+                buf->f_bsize = buf->f_frsize;
+        }
+#endif /* __FreeBSD__ */
+
+        return ret;
+}
+
+
+int
+sys_fstatvfs (int fd, struct statvfs *buf)
+{
+        int ret;
+
+        ret = fstatvfs (fd, buf);
+#ifdef __FreeBSD__
+        /* FreeBSD doesn't return the expected vaule in buf->f_bsize. It
+         * contains the optimal I/O size instead of the file system block
+         * size. Gluster expects this field to contain the block size.
+         */
+        if (ret == 0) {
+                buf->f_bsize = buf->f_frsize;
+        }
+#endif /* __FreeBSD__ */
+
+        return ret;
 }
 
 
diff --git a/libglusterfs/src/syscall.h b/libglusterfs/src/syscall.h
index b549f6a1b3c..81884f88164 100644
--- a/libglusterfs/src/syscall.h
+++ b/libglusterfs/src/syscall.h
@@ -147,6 +147,9 @@ int
 sys_statvfs (const char *path, struct statvfs *buf);
 
 int
+sys_fstatvfs (int fd, struct statvfs *buf);
+
+int
 sys_close (int fd);
 
 int