#include "nfs4_acls.h"
#include "vfs_gpfs.h"
+struct gpfs_config_data {
+ bool sharemodes;
+ bool leases;
+};
+
+
static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
- uint32 share_mode)
+ uint32 share_mode, uint32 access_mask)
{
- START_PROFILE(syscall_kernel_flock);
+ struct gpfs_config_data *config;
+
+ SMB_VFS_HANDLE_GET_DATA(handle, config,
+ struct gpfs_config_data,
+ return -1);
- kernel_flock(fsp->fh->fd, share_mode);
+ START_PROFILE(syscall_kernel_flock);
- if (!set_gpfs_sharemode(fsp, fsp->access_mask, fsp->share_access)) {
+ kernel_flock(fsp->fh->fd, share_mode, access_mask);
+ if (config->sharemodes
+ && !set_gpfs_sharemode(fsp, access_mask, fsp->share_access)) {
return -1;
-
}
END_PROFILE(syscall_kernel_flock);
static int vfs_gpfs_close(vfs_handle_struct *handle, files_struct *fsp)
{
- if ((fsp->fh != NULL) && (fsp->fh->fd != -1)) {
+
+ struct gpfs_config_data *config;
+
+ SMB_VFS_HANDLE_GET_DATA(handle, config,
+ struct gpfs_config_data,
+ return -1);
+
+ if (config->sharemodes && (fsp->fh != NULL) && (fsp->fh->fd != -1)) {
set_gpfs_sharemode(fsp, 0, 0);
}
static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp,
int leasetype)
{
- int ret;
+ struct gpfs_config_data *config;
+ int ret=0;
+
+ SMB_VFS_HANDLE_GET_DATA(handle, config,
+ struct gpfs_config_data,
+ return -1);
START_PROFILE(syscall_linux_setlease);
- if ( linux_set_lease_sighandler(fsp->fh->fd) == -1)
+ if (linux_set_lease_sighandler(fsp->fh->fd) == -1)
return -1;
- ret = set_gpfs_lease(fsp->fh->fd,leasetype);
+ if (config->leases) {
+ ret = set_gpfs_lease(fsp->fh->fd,leasetype);
+ }
- if ( ret < 0 ) {
+ if (ret < 0) {
/* This must have come from GPFS not being available */
/* or some other error, hence call the default */
ret = linux_setlease(fsp->fh->fd, leasetype);
if (acl->acl_version&GPFS_ACL_VERSION_NFS4)
{
- if ((psd->type&SEC_DESC_DACL_PROTECTED)) {
+ if (lp_parm_bool(fsp->conn->params->service, "gpfs",
+ "refuse_dacl_protected", false)
+ && (psd->type&SEC_DESC_DACL_PROTECTED)) {
DEBUG(2, ("Rejecting unsupported ACL with DACL_PROTECTED bit set\n"));
return NT_STATUS_NOT_SUPPORTED;
}
pacl->acl_nace));
result = gpfs2smb_acl(pacl);
- if (result == NULL) {
- goto done;
+ if (result != NULL) {
+ errno = 0;
}
done:
int i;
files_struct fake_fsp; /* TODO: rationalize parametrization */
SMB4ACE_T *smbace;
- struct smb_filename *smb_fname = NULL;
NTSTATUS status;
DEBUG(10, ("gpfsacl_emu_chmod invoked for %s mode %o\n", path, mode));
static int vfs_gpfs_chmod(vfs_handle_struct *handle, const char *path, mode_t mode)
{
- SMB_STRUCT_STAT st;
- int rc;
+ struct smb_filename *smb_fname_cpath;
+ int rc;
+ NTSTATUS status;
- if (SMB_VFS_NEXT_STAT(handle, path, &st) != 0) {
- return -1;
- }
+ status = create_synthetic_smb_fname(
+ talloc_tos(), path, NULL, NULL, &smb_fname_cpath);
- /* avoid chmod() if possible, to preserve acls */
- if ((st.st_ex_mode & ~S_IFMT) == mode) {
- return 0;
- }
+ if (SMB_VFS_NEXT_STAT(handle, smb_fname_cpath) != 0) {
+ return -1;
+ }
- rc = gpfsacl_emu_chmod(path, mode);
- if (rc == 1)
- return SMB_VFS_NEXT_CHMOD(handle, path, mode);
- return rc;
+ /* avoid chmod() if possible, to preserve acls */
+ if ((smb_fname_cpath->st.st_ex_mode & ~S_IFMT) == mode) {
+ return 0;
+ }
+
+ rc = gpfsacl_emu_chmod(path, mode);
+ if (rc == 1)
+ return SMB_VFS_NEXT_CHMOD(handle, path, mode);
+ return rc;
}
static int vfs_gpfs_fchmod(vfs_handle_struct *handle, files_struct *fsp, mode_t mode)
ret = set_gpfs_winattrs(CONST_DISCARD(char *, path),
GPFS_WINATTR_SET_ATTRS, &attrs);
if ( ret == -1){
+ if (errno == ENOSYS) {
+ return SMB_VFS_NEXT_SETXATTR(handle, path, name, value,
+ size, flags);
+ }
+
DEBUG(1, ("gpfs_set_xattr:Set GPFS attributes failed %d\n",ret));
return -1;
}
return 0;
}
-static size_t gpfs_get_xattr(struct vfs_handle_struct *handle, const char *path,
+static ssize_t gpfs_get_xattr(struct vfs_handle_struct *handle, const char *path,
const char *name, void *value, size_t size){
char *attrstr = value;
unsigned int dosmode = 0;
struct gpfs_winattr attrs;
int ret = 0;
+ ssize_t result;
DEBUG(10, ("gpfs_get_xattr: %s \n",path));
ret = get_gpfs_winattrs(CONST_DISCARD(char *, path), &attrs);
if ( ret == -1){
+ if (errno == ENOSYS) {
+ return SMB_VFS_NEXT_GETXATTR(handle, path, name, value,
+ size);
+ }
+
DEBUG(1, ("gpfs_get_xattr: Get GPFS attributes failed: %d\n",ret));
return -1;
}
dosmode |= FILE_ATTRIBUTE_READONLY;
}
- snprintf(attrstr, size, "0x%x", dosmode & SAMBA_ATTRIBUTES_MASK);
+ result = snprintf(attrstr, size, "0x%x",
+ dosmode & SAMBA_ATTRIBUTES_MASK) + 1;
+
DEBUG(10, ("gpfs_get_xattr: returning %s\n",attrstr));
- return size;
+ return result;
}
static int vfs_gpfs_stat(struct vfs_handle_struct *handle,
return -1;
}
status = get_full_smb_filename(talloc_tos(), smb_fname, &fname);
- if (!NT_STATUS_IS_OK) {
+ if (!NT_STATUS_IS_OK(status)) {
errno = map_errno_from_nt_status(status);
return -1;
}
return -1;
}
status = get_full_smb_filename(talloc_tos(), smb_fname, &path);
- if (!NT_STATUS_IS_OK) {
+ if (!NT_STATUS_IS_OK(status)) {
errno = map_errno_from_nt_status(status);
return -1;
}
return 0;
}
+static int vfs_gpfs_ntimes(struct vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ struct smb_file_time *ft)
+{
+
+ struct gpfs_winattr attrs;
+ int ret;
+ char *path = NULL;
+ NTSTATUS status;
+
+ ret = SMB_VFS_NEXT_NTIMES(handle, smb_fname, ft);
+ if(ret == -1){
+ DEBUG(1,("vfs_gpfs_ntimes: SMB_VFS_NEXT_NTIMES failed\n"));
+ return -1;
+ }
+
+ if(null_timespec(ft->create_time)){
+ DEBUG(10,("vfs_gpfs_ntimes:Create Time is NULL\n"));
+ return 0;
+ }
+
+ status = get_full_smb_filename(talloc_tos(), smb_fname, &path);
+ if (!NT_STATUS_IS_OK(status)) {
+ errno = map_errno_from_nt_status(status);
+ return -1;
+ }
+
+ attrs.winAttrs = 0;
+ attrs.creationTime.tv_sec = ft->create_time.tv_sec;
+ attrs.creationTime.tv_nsec = ft->create_time.tv_nsec;
+
+ ret = set_gpfs_winattrs(CONST_DISCARD(char *, path),
+ GPFS_WINATTR_SET_CREATION_TIME, &attrs);
+ if(ret == -1 && errno != ENOSYS){
+ DEBUG(1,("vfs_gpfs_ntimes: set GPFS ntimes failed %d\n",ret));
+ return -1;
+ }
+ return 0;
+
+}
+
+int vfs_gpfs_connect(struct vfs_handle_struct *handle, const char *service,
+ const char *user)
+{
+ struct gpfs_config_data *config;
+ int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+ if (ret < 0) {
+ return ret;
+ }
+
+ config = talloc_zero(handle->conn, struct gpfs_config_data);
+ if (!config) {
+ SMB_VFS_NEXT_DISCONNECT(handle);
+ DEBUG(0, ("talloc_zero() failed\n")); return -1;
+ }
+
+ config->sharemodes = lp_parm_bool(SNUM(handle->conn), "gpfs",
+ "sharemodes", true);
+
+ config->leases = lp_parm_bool(SNUM(handle->conn), "gpfs",
+ "leases", true);
+
+ SMB_VFS_HANDLE_SET_DATA(handle, config,
+ NULL, struct gpfs_config_data,
+ return -1);
+
+ return 0;
+}
+
+
+static int vfs_gpfs_ftruncate(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ SMB_OFF_T len)
+{
+ int result;
+
+ result = smbd_gpfs_ftrunctate(fsp->fh->fd, len);
+ if ((result == -1) && (errno == ENOSYS)) {
+ return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, len);
+ }
+ return result;
+}
+
static struct vfs_fn_pointers vfs_gpfs_fns = {
+ .connect_fn = vfs_gpfs_connect,
.kernel_flock = vfs_gpfs_kernel_flock,
- .setlease = vfs_gpfs_setlease,
+ .linux_setlease = vfs_gpfs_setlease,
.get_real_filename = vfs_gpfs_get_real_filename,
.fget_nt_acl = gpfsacl_fget_nt_acl,
.get_nt_acl = gpfsacl_get_nt_acl,
.chmod = vfs_gpfs_chmod,
.fchmod = vfs_gpfs_fchmod,
.close_fn = vfs_gpfs_close,
- .set_xattr = gpfs_set_xattr,
- .get_xattr = gpfs_get_xattr,
+ .setxattr = gpfs_set_xattr,
+ .getxattr = gpfs_get_xattr,
.stat = vfs_gpfs_stat,
.fstat = vfs_gpfs_fstat,
.lstat = vfs_gpfs_lstat,
+ .ntimes = vfs_gpfs_ntimes,
+ .ftruncate = vfs_gpfs_ftruncate,
};
NTSTATUS vfs_gpfs_init(void);
git.samba.org / samba.git / blobdiff