diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 13:04:03 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:09 +0200 |
| commit | 900473a45b90c44e5f301feae42f821214228e27 (patch) | |
| tree | e2e5d94f7c7b5f93a812d0320d954235e74bb440 /source3 | |
| parent | afdb78075c29774c550625e1115ffb7eaf6e015a (diff) | |
| download | samba-900473a45b90c44e5f301feae42f821214228e27.tar.gz samba-900473a45b90c44e5f301feae42f821214228e27.tar.bz2 samba-900473a45b90c44e5f301feae42f821214228e27.zip | |
build: Remove sys_seekdir wrapper
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/lib/system.c | 9 | ||||
| -rw-r--r-- | source3/modules/onefs_dir.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 2 |
4 files changed, 2 insertions, 12 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 0033e643c1..c8db7bd02c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -338,7 +338,6 @@ int sys_posix_fallocate(int fd, SMB_OFF_T offset, SMB_OFF_T len); int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OFF_T len); void kernel_flock(int fd, uint32 share_mode, uint32 access_mask); SMB_STRUCT_DIR *sys_fdopendir(int fd); -void sys_seekdir(SMB_STRUCT_DIR *dirp, long offset); long sys_telldir(SMB_STRUCT_DIR *dirp); void sys_rewinddir(SMB_STRUCT_DIR *dirp); int sys_closedir(SMB_STRUCT_DIR *dirp); diff --git a/source3/lib/system.c b/source3/lib/system.c index 6b778c61c0..7a2e1bc38c 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -634,15 +634,6 @@ SMB_STRUCT_DIR *sys_fdopendir(int fd) } /******************************************************************* - A seekdir wrapper. -********************************************************************/ - -void sys_seekdir(SMB_STRUCT_DIR *dirp, long offset) -{ - seekdir(dirp, offset); -} - -/******************************************************************* A telldir wrapper. ********************************************************************/ diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c index 808f6fb047..da60ff388e 100644 --- a/source3/modules/onefs_dir.c +++ b/source3/modules/onefs_dir.c @@ -416,7 +416,7 @@ onefs_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset) if (!lp_parm_bool(SNUM(handle->conn), PARM_ONEFS_TYPE, PARM_USE_READDIRPLUS, PARM_USE_READDIRPLUS_DEFAULT)) { - return sys_seekdir(dirp, offset); + return seekdir(dirp, offset); } /* Validate inputs */ diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index f64bbcb526..e9ff7cb8bc 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -386,7 +386,7 @@ static SMB_STRUCT_DIRENT *vfswrap_readdir(vfs_handle_struct *handle, static void vfswrap_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset) { START_PROFILE(syscall_seekdir); - sys_seekdir(dirp, offset); + seekdir(dirp, offset); END_PROFILE(syscall_seekdir); } |