diff options
| author | Jeremy Allison <jra@samba.org> | 2000-05-02 03:20:47 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-05-02 03:20:47 +0000 |
| commit | ba020b0612ee975df15ceaf2eabf0cc3f208dc3e (patch) | |
| tree | caba9b545ebd4f9edf62da2da012481c119a957c /source3/include | |
| parent | 693ffb8466ada58ecc59fde754ba79fc6f51528d (diff) | |
| download | samba-ba020b0612ee975df15ceaf2eabf0cc3f208dc3e.tar.gz samba-ba020b0612ee975df15ceaf2eabf0cc3f208dc3e.tar.bz2 samba-ba020b0612ee975df15ceaf2eabf0cc3f208dc3e.zip | |
Moved uglyness needed in fcntl locking (64->32 bit mapping, NFS
errors etc.) into locking/posix.c, where it is needed. fcntl_lock in lib/util.c
is now very small and clean.
Added (*lock) op to vfs layer.
Jeremy.
(This used to be commit 46092ee1410faa4e3c143d80a960a8adaa19d7fc)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/include/vfs.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index d418ac4268..11a8df31a4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -335,7 +335,6 @@ char *readdirname(DIR *p); BOOL is_in_path(char *name, name_compare_entry *namelist); void set_namearray(name_compare_entry **ppname_array, char *namelist); void free_namearray(name_compare_entry *name_array); -uint32 map_lock_offset(uint32 high, uint32 low); BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); BOOL is_myname(char *s); void set_remote_arch(enum remote_arch_types type); @@ -3374,6 +3373,7 @@ int vfswrap_unlink(char *path); int vfswrap_chmod(char *path, mode_t mode); int vfswrap_utime(char *path, struct utimbuf *times); int vfswrap_ftruncate(int fd, SMB_OFF_T offset); +BOOL vfswrap_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); /*The following definitions come from smbd/vfs.c */ diff --git a/source3/include/vfs.h b/source3/include/vfs.h index a09991a0e7..1b4e57f2ac 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -137,6 +137,7 @@ struct vfs_ops { int (*chmod)(char *path, mode_t mode); int (*utime)(char *path, struct utimbuf *times); int (*ftruncate)(int fd, SMB_OFF_T offset); + BOOL (*lock)(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); }; struct vfs_options { |