diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-12-30 17:17:24 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-01-11 22:13:36 -0800 |
| commit | 5c48ba6563ff025037b9337d34b9aa13de610fba (patch) | |
| tree | e24789f5a1f0ed1fad8fe76b072148c23661be01 /source3/modules/onefs_system.c | |
| parent | ce5eded7e03d86d5d7f2ee1a9d975fae116d2306 (diff) | |
| download | samba-5c48ba6563ff025037b9337d34b9aa13de610fba.tar.gz samba-5c48ba6563ff025037b9337d34b9aa13de610fba.tar.bz2 samba-5c48ba6563ff025037b9337d34b9aa13de610fba.zip | |
s3: General cleanup of the open path in the OneFS vfs module
Diffstat (limited to 'source3/modules/onefs_system.c')
| -rw-r--r-- | source3/modules/onefs_system.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c index 485e7f56ac..ee257d8f90 100644 --- a/source3/modules/onefs_system.c +++ b/source3/modules/onefs_system.c @@ -91,7 +91,7 @@ static const char *onefs_oplock_str(enum oplock_type onefs_oplock_type) /* * Convert from onefs to samba oplock. */ -static int onefs_to_samba_oplock(enum oplock_type onefs_oplock) +static int onefs_oplock_to_samba_oplock(enum oplock_type onefs_oplock) { switch (onefs_oplock) { case OPLOCK_NONE: @@ -112,7 +112,7 @@ static int onefs_to_samba_oplock(enum oplock_type onefs_oplock) /* * Convert from samba to onefs oplock. */ -static enum oplock_type samba_to_onefs_oplock(int samba_oplock_type) +static enum oplock_type onefs_samba_oplock_to_oplock(int samba_oplock_type) { if (BATCH_OPLOCK_TYPE(samba_oplock_type)) return OPLOCK_BATCH; if (EXCLUSIVE_OPLOCK_TYPE(samba_oplock_type)) return OPLOCK_EXCLUSIVE; @@ -152,7 +152,7 @@ int onefs_sys_create_file(connection_struct *conn, secinfo = (get_sec_info(sd) & IFS_SEC_INFO_KNOWN_MASK); - status = onefs_setup_sd(secinfo, sd, &ifs_sd); + status = onefs_samba_sd_to_sd(secinfo, sd, &ifs_sd); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("SD initialization failure: %s", @@ -164,7 +164,7 @@ int onefs_sys_create_file(connection_struct *conn, pifs_sd = &ifs_sd; } - onefs_oplock = samba_to_onefs_oplock(oplock_request); + onefs_oplock = onefs_samba_oplock_to_oplock(oplock_request); /* Temporary until oplock work is added to vfs_onefs */ onefs_oplock = OPLOCK_NONE; @@ -204,7 +204,8 @@ int onefs_sys_create_file(connection_struct *conn, onefs_oplock_str(onefs_granted_oplock))); if (granted_oplock) { - *granted_oplock = onefs_to_samba_oplock(onefs_granted_oplock); + *granted_oplock = + onefs_oplock_to_samba_oplock(onefs_granted_oplock); } out: |