summaryrefslogtreecommitdiffstats
path: root/source/include/vfs.h
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2006-11-10 15:40:48 +0000
committerJim McDonough <jmcd@samba.org>2006-11-10 15:40:48 +0000
commitc97f949803abf7a228b7468ffb9128c49a574213 (patch)
treee561415ec2199facea72d3a8a54374f4e29da886 /source/include/vfs.h
parent47c1f3182b2fc48fff2a95185ae69330472091ca (diff)
downloadsamba-c97f949803abf7a228b7468ffb9128c49a574213.tar.gz
samba-c97f949803abf7a228b7468ffb9128c49a574213.tar.xz
samba-c97f949803abf7a228b7468ffb9128c49a574213.zip
r19654: merge GPFS vfs support from 3.0, including adding kernel_flock vfs op.
Diffstat (limited to 'source/include/vfs.h')
-rw-r--r--source/include/vfs.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/include/vfs.h b/source/include/vfs.h
index fb99d824125..da2cd51551f 100644
--- a/source/include/vfs.h
+++ b/source/include/vfs.h
@@ -142,6 +142,7 @@ typedef enum _vfs_op_type {
SMB_VFS_OP_UTIME,
SMB_VFS_OP_FTRUNCATE,
SMB_VFS_OP_LOCK,
+ SMB_VFS_OP_KERNEL_FLOCK,
SMB_VFS_OP_GETLOCK,
SMB_VFS_OP_SYMLINK,
SMB_VFS_OP_READLINK,
@@ -264,6 +265,7 @@ struct vfs_ops {
int (*utime)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *path, struct utimbuf *times);
int (*ftruncate)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_OFF_T offset);
BOOL (*lock)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
+ int (*kernel_flock)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, uint32 share_mode);
BOOL (*getlock)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid);
int (*symlink)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *oldpath, const char *newpath);
int (*readlink)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *path, char *buf, size_t bufsiz);
@@ -378,6 +380,7 @@ struct vfs_ops {
struct vfs_handle_struct *utime;
struct vfs_handle_struct *ftruncate;
struct vfs_handle_struct *lock;
+ struct vfs_handle_struct *kernel_flock;
struct vfs_handle_struct *getlock;
struct vfs_handle_struct *symlink;
struct vfs_handle_struct *readlink;