vfs_ceph: fix strict_allocate_ftruncate()
authorDavid Disseldorp <ddiss@samba.org>
Tue, 26 Feb 2019 15:07:27 +0000 (16:07 +0100)
committerKarolin Seeger <kseeger@samba.org>
Mon, 4 Mar 2019 10:37:56 +0000 (10:37 +0000)
The vfs_ceph "strict allocate = yes" ftruncate wrapper may attempt
*local* filesystem ftruncate(). Fix this.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13807

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
(cherry picked from commit 70329c36ed91dd0e50ff66f9b0a85c62ac8a621e)

source3/modules/vfs_ceph.c

index 9f111bea2a08db4191f5a16c26fa86725ecadf4b..4a705ea14a351171c9d03d32ae2d234d64827b7e 100644 (file)
@@ -1053,8 +1053,10 @@ static int strict_allocate_ftruncate(struct vfs_handle_struct *handle, files_str
                return 0;
 
        /* Shrink - just ftruncate. */
-       if (pst->st_ex_size > len)
-               return ftruncate(fsp->fh->fd, len);
+       if (pst->st_ex_size > len) {
+               ret = ceph_ftruncate(handle->data, fsp->fh->fd, len);
+               WRAP_RETURN(ret);
+       }
 
        space_to_write = len - pst->st_ex_size;