From 77a3e46a4c5667e5a458e9931ed7129625a23d60 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 29 Jan 2008 18:33:22 +0300 Subject: Fix typos and replace statvfs call with fs_capabilities() (This used to be commit 863b5ed07aca0978aeaf919d7c51204a95ce03e0) --- source3/modules/vfs_tsmsm.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c index 3badaa3923..791e8cfcd0 100644 --- a/source3/modules/vfs_tsmsm.c +++ b/source3/modules/vfs_tsmsm.c @@ -119,10 +119,10 @@ static int tsmsm_connect(struct vfs_handle_struct *handle, tsmd->online_ratio = FILE_IS_ONLINE_RATIO; } else { tsmd->online_ratio = strtof(fres, NULL); - if (tsmd->online_ration > 1.0 || - tsmd->online_ration <= 0.0) { + if (tsmd->online_ratio > 1.0 || + tsmd->online_ratio <= 0.0) { DEBUG(1, ("tsmsm_connect: invalid online ration %f - using %f.\n", - tsmd->online_ration, (float)FILE_IS_ONLINE_RATIO)); + tsmd->online_ratio, (float)FILE_IS_ONLINE_RATIO)); } } @@ -189,7 +189,7 @@ static bool tsmsm_is_offline(struct vfs_handle_struct *handle, DEBUG(0, ("Stale DMAPI session, re-creating it.\n")); lerrno = EINVAL; if (dmapi_new_session()) { - sessionp = dmapi_get_current_session(); + dmsession_id = dmapi_get_current_session(); } else { DEBUG(0, ("Unable to re-create DMAPI session, assuming offline (%s) - %s\n", @@ -323,14 +323,9 @@ static int tsmsm_set_offline(struct vfs_handle_struct *handle, return result; } -static bool tsmsm_statvfs(struct vfs_handle_struct *handle, const char *path, vfs_statvfs_struct *statbuf) +static uint32_t tsmsm_fs_capabilities(struct vfs_handle_struct *handle) { - bool result; - - result = SMB_VFS_NEXT_STATVFS(handle, path, statbuf); - statbuf->FsCapabilities | = FILE_SUPPORTS_REMOTE_STORAGE | FILE_SUPPORTS_REPARSE_POINTS; - - return result; + return SMB_VFS_NEXT_FS_CAPABILITIES(handle) | FILE_SUPPORTS_REMOTE_STORAGE | FILE_SUPPORTS_REPARSE_POINTS; } static vfs_op_tuple vfs_tsmsm_ops[] = { @@ -339,7 +334,7 @@ static vfs_op_tuple vfs_tsmsm_ops[] = { {SMB_VFS_OP(tsmsm_connect), SMB_VFS_OP_CONNECT, SMB_VFS_LAYER_TRANSPARENT}, - {SMB_VFS_OP(tsmsm_statvfs), SMB_VFS_OP_STATVFS, + {SMB_VFS_OP(tsmsm_fs_capabilities), SMB_VFS_OP_FS_CAPABILITIES, SMB_VFS_LAYER_TRANSPARENT}, {SMB_VFS_OP(tsmsm_aio_force), SMB_VFS_OP_AIO_FORCE, SMB_VFS_LAYER_TRANSPARENT}, -- cgit