diff options
| author | David Disseldorp <ddiss@samba.org> | 2019-02-26 13:54:21 +0100 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2019-02-27 14:53:19 +0000 |
| commit | f43cc62fb25d607a489cafd96b21cf0788773bbf (patch) | |
| tree | 70482b2e142543c2295c9bf9ba9383e395b9d918 /source3 | |
| parent | 155f1289ba7a4802fbb99fbc9ea90d8bc6cff0c9 (diff) | |
| download | samba-f43cc62fb25d607a489cafd96b21cf0788773bbf.tar.gz | |
vfs_ceph: drop ifdef HAVE_FCHOWN/_FCHMOD
The cephwrap_fchown() and cephwrap_fchmod() wrappers call the
corresponding libcephfs functions. It doesn't make sense to make this
logic dependent on regular fchown()/fchmod() function presence, so remove
the ifdefs.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_ceph.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index 3fb5943eca6..67b8d139891 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -961,15 +961,9 @@ static int cephwrap_fchmod(struct vfs_handle_struct *handle, files_struct *fsp, int result; DBG_DEBUG("[CEPH] fchmod(%p, %p, %d)\n", handle, fsp, mode); - -#if defined(HAVE_FCHMOD) result = ceph_fchmod(handle->data, fsp->fh->fd, mode); DBG_DEBUG("[CEPH] fchmod(...) = %d\n", result); WRAP_RETURN(result); -#else - errno = ENOSYS; -#endif - return -1; } static int cephwrap_chown(struct vfs_handle_struct *handle, @@ -987,17 +981,11 @@ static int cephwrap_chown(struct vfs_handle_struct *handle, static int cephwrap_fchown(struct vfs_handle_struct *handle, files_struct *fsp, uid_t uid, gid_t gid) { int result; -#ifdef HAVE_FCHOWN DBG_DEBUG("[CEPH] fchown(%p, %p, %d, %d)\n", handle, fsp, uid, gid); result = ceph_fchown(handle->data, fsp->fh->fd, uid, gid); DBG_DEBUG("[CEPH] fchown(...) = %d\n", result); WRAP_RETURN(result); -#else - errno = ENOSYS; - result = -1; -#endif - return result; } static int cephwrap_lchown(struct vfs_handle_struct *handle, |