Author: metze Date: 2007-08-02 09:19:04 +0000 (Thu, 02 Aug 2007) New Revision: 24123
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24123 Log: add file_id_create() to some vfs modules metze Modified: branches/SAMBA_3_2/examples/VFS/skel_opaque.c branches/SAMBA_3_2/examples/VFS/skel_transparent.c branches/SAMBA_3_2/source/modules/vfs_full_audit.c Changeset: Modified: branches/SAMBA_3_2/examples/VFS/skel_opaque.c =================================================================== --- branches/SAMBA_3_2/examples/VFS/skel_opaque.c 2007-08-02 08:59:17 UTC (rev 24122) +++ branches/SAMBA_3_2/examples/VFS/skel_opaque.c 2007-08-02 09:19:04 UTC (rev 24123) @@ -280,6 +280,15 @@ return -1; } +static struct file_id skel_file_id_create(vfs_handle_struct *handle, + SMB_DEV_T dev, SMB_INO_T inode) +{ + struct file_id id_zero; + ZERO_STRUCT(id_zero); + errno = ENOSYS; + return id_zero; +} + static size_t skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc) { @@ -618,9 +627,8 @@ {SMB_VFS_OP(skel_realpath), SMB_VFS_OP_REALPATH, SMB_VFS_LAYER_OPAQUE}, {SMB_VFS_OP(skel_notify_watch), SMB_VFS_OP_NOTIFY_WATCH, SMB_VFS_LAYER_OPAQUE}, {SMB_VFS_OP(skel_chflags), SMB_VFS_OP_CHFLAGS, SMB_VFS_LAYER_OPAQUE}, + {SMB_VFS_OP(skel_file_id_create), SMB_VFS_OP_FILE_ID_CREATE, SMB_VFS_LAYER_OPAQUE}, - - /* NT File ACL operations */ {SMB_VFS_OP(skel_fget_nt_acl), SMB_VFS_OP_FGET_NT_ACL, SMB_VFS_LAYER_OPAQUE}, Modified: branches/SAMBA_3_2/examples/VFS/skel_transparent.c =================================================================== --- branches/SAMBA_3_2/examples/VFS/skel_transparent.c 2007-08-02 08:59:17 UTC (rev 24122) +++ branches/SAMBA_3_2/examples/VFS/skel_transparent.c 2007-08-02 09:19:04 UTC (rev 24123) @@ -273,6 +273,12 @@ return SMB_VFS_NEXT_CHFLAGS(handle, path, flags); } +static struct file_id skel_file_id_create(vfs_handle_struct *handle, + SMB_DEV_T dev, SMB_INO_T inode) +{ + return SMB_VFS_NEXT_FILE_ID_CREATE(handle, dev, inode); +} + static size_t skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc) { @@ -579,6 +585,7 @@ {SMB_VFS_OP(skel_realpath), SMB_VFS_OP_REALPATH, SMB_VFS_LAYER_TRANSPARENT}, {SMB_VFS_OP(skel_notify_watch), SMB_VFS_OP_NOTIFY_WATCH, SMB_VFS_LAYER_TRANSPARENT}, {SMB_VFS_OP(skel_chflags), SMB_VFS_OP_CHFLAGS, SMB_VFS_LAYER_TRANSPARENT}, + {SMB_VFS_OP(skel_file_id_create), SMB_VFS_OP_FILE_ID_CREATE, SMB_VFS_LAYER_TRANSPARENT}, /* NT File ACL operations */ Modified: branches/SAMBA_3_2/source/modules/vfs_full_audit.c =================================================================== --- branches/SAMBA_3_2/source/modules/vfs_full_audit.c 2007-08-02 08:59:17 UTC (rev 24122) +++ branches/SAMBA_3_2/source/modules/vfs_full_audit.c 2007-08-02 09:19:04 UTC (rev 24123) @@ -184,6 +184,8 @@ void *private_data, void *handle_p); static int smb_full_audit_chflags(vfs_handle_struct *handle, const char *path, uint flags); +static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle, + SMB_DEV_T dev, SMB_INO_T inode); static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc); @@ -413,6 +415,8 @@ SMB_VFS_LAYER_LOGGER}, {SMB_VFS_OP(smb_full_audit_chflags), SMB_VFS_OP_CHFLAGS, SMB_VFS_LAYER_LOGGER}, + {SMB_VFS_OP(smb_full_audit_file_id_create), SMB_VFS_OP_FILE_ID_CREATE, + SMB_VFS_LAYER_LOGGER}, /* NT ACL operations. */ @@ -579,6 +583,7 @@ { SMB_VFS_OP_REALPATH, "realpath" }, { SMB_VFS_OP_NOTIFY_WATCH, "notify_watch" }, { SMB_VFS_OP_CHFLAGS, "chflags" }, + { SMB_VFS_OP_FILE_ID_CREATE, "file_id_create" }, { SMB_VFS_OP_FGET_NT_ACL, "fget_nt_acl" }, { SMB_VFS_OP_GET_NT_ACL, "get_nt_acl" }, { SMB_VFS_OP_FSET_NT_ACL, "fset_nt_acl" }, @@ -1466,6 +1471,23 @@ return result; } +static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle, + SMB_DEV_T dev, SMB_INO_T inode) +{ + struct file_id id_zero; + struct file_id result; + + ZERO_STRUCT(id_zero); + + result = SMB_VFS_NEXT_FILE_ID_CREATE(handle, dev, inode); + + do_log(SMB_VFS_OP_FILE_ID_CREATE, + !file_id_equal(&id_zero, &result), + handle, "%s", file_id_static_string(&result)); + + return result; +} + static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc)
