#include "cm_rpc.h"
#include <strsafe.h>
#include <winioctl.h>
-#include <..\afsrdr\kif.h>
#include <rx\rx.h>
#ifdef _DEBUG
extern void afsi_log(char *pattern, ...);
-afs_uint32 cm_pioctlFollowMountPoint = 0;
-
void cm_InitIoctl(void)
{
lock_InitializeMutex(&cm_Afsdsbmt_Lock, "AFSDSBMT.INI Access Lock");
{
long code;
- lock_ObtainWrite(&scp->bufCreateLock);
code = buf_CleanVnode(scp, userp, reqp);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_DiscardSCache(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
- lock_ReleaseWrite(&scp->bufCreateLock);
osi_Log2(afsd_logp,"cm_CleanFile scp 0x%x returns error: [%x]",scp, code);
return code;
}
}
#endif
- lock_ObtainWrite(&scp->bufCreateLock);
code = buf_FlushCleanPages(scp, userp, reqp);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_DiscardSCache(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
- lock_ReleaseWrite(&scp->bufCreateLock);
osi_Log2(afsd_logp,"cm_FlushFile scp 0x%x returns error: [%x]",scp, code);
return code;
}
for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
cm_HoldSCacheNoLock(scp);
lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_InvalidateACLUser(scp, userp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
lock_ObtainWrite(&cm_scacheLock);
cm_ReleaseSCacheNoLock(scp);
}
/* parse the passed-in file name and do a namei on it. If we fail,
* return an error code, otherwise return the vnode located in *scpp.
*/
+#define CM_PARSE_FLAG_LITERAL 1
+
long cm_ParseIoctlPath(smb_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp,
- cm_scache_t **scpp)
+ cm_scache_t **scpp, afs_uint32 flags)
{
long code;
-#ifndef AFSIFS
cm_scache_t *substRootp = NULL;
cm_scache_t *iscp = NULL;
-#endif
char * relativePath;
char * lastComponent = NULL;
- afs_uint32 follow = (cm_pioctlFollowMountPoint ? CM_FLAG_FOLLOW : CM_FLAG_NOMOUNTCHASE);
+ afs_uint32 follow = (flags & CM_PARSE_FLAG_LITERAL ? CM_FLAG_NOMOUNTCHASE : CM_FLAG_FOLLOW);
relativePath = ioctlp->inDatap;
/* setup the next data value for the caller to use */
* \\netbios-name\submount\path\.
* \\netbios-name\submount\path\file
*/
- TranslateExtendedChars(relativePath);
- /* This is usually nothing, but for StatMountPoint it is the file name. */
- TranslateExtendedChars(ioctlp->inDatap);
+ /* We do not perform path name translation on the ioctl path data
+ * because these paths were not translated by Windows through the
+ * file system API. Therefore, they are not OEM characters but
+ * whatever the display character set is.
+ */
+ // TranslateExtendedChars(relativePath);
-#ifdef AFSIFS
- /* we have passed the whole path, including the afs prefix.
- when the pioctl call is made, we perform an ioctl to afsrdr
- and it returns the correct (full) path. therefore, there is
- no drive letter, and the path is absolute. */
- code = cm_NameI(cm_data.rootSCachep, relativePath,
- CM_FLAG_CASEFOLD,
- userp, "", reqp, scpp);
-
- if (code) {
- osi_Log1(afsd_logp,"cm_ParseIoctlPath code 0x%x", code);
- return code;
- }
-#else /* AFSIFS */
+ /* This is usually nothing, but for StatMountPoint it is the file name. */
+ // TranslateExtendedChars(ioctlp->inDatap);
if (relativePath[0] == relativePath[1] &&
relativePath[1] == '\\' &&
if (iscp)
cm_ReleaseSCache(iscp);
} else {
- code = cm_NameI(substRootp, relativePath, CM_FLAG_CASEFOLD,
+ code = cm_NameI(substRootp, relativePath, CM_FLAG_CASEFOLD | follow,
userp, NULL, reqp, scpp);
}
if (code) {
return code;
}
}
-#endif /* AFSIFS */
if (substRootp)
cm_ReleaseSCache(substRootp);
void cm_SkipIoctlPath(smb_ioctl_t *ioctlp)
{
- long temp;
+ size_t temp;
- temp = (long) strlen(ioctlp->inDatap) + 1;
+ temp = strlen(ioctlp->inDatap) + 1;
ioctlp->inDatap += temp;
}
+/*
+ * Must be called before cm_ParseIoctlPath or cm_SkipIoctlPath
+ */
+static cm_ioctlQueryOptions_t *
+cm_IoctlGetQueryOptions(struct smb_ioctl *ioctlp, struct cm_user *userp)
+{
+ afs_uint32 pathlen = strlen(ioctlp->inDatap) + 1;
+ char *p = ioctlp->inDatap + pathlen;
+ cm_ioctlQueryOptions_t * optionsp = NULL;
+
+ if (ioctlp->inCopied > p - ioctlp->inAllocp) {
+ optionsp = (cm_ioctlQueryOptions_t *)p;
+ if (optionsp->size < 12 /* minimum size of struct */)
+ optionsp = NULL;
+ }
+
+ return optionsp;
+}
+
+/*
+ * Must be called after cm_ParseIoctlPath or cm_SkipIoctlPath
+ * or any other time that ioctlp->inDatap points at the
+ * cm_ioctlQueryOptions_t object.
+ */
+static void
+cm_IoctlSkipQueryOptions(struct smb_ioctl *ioctlp, struct cm_user *userp)
+{
+ cm_ioctlQueryOptions_t * optionsp = (cm_ioctlQueryOptions_t *)ioctlp->inDatap;
+ ioctlp->inDatap += optionsp->size;
+}
/* format the specified path to look like "/afs/<cellname>/usr", by
* adding "/afs" (if necessary) in front, changing any \'s to /'s, and
AFSFetchStatus fileStatus;
AFSVolSync volSync;
long code;
- AFSFid fid;
+ AFSFid afid;
int tlen;
cm_req_t req;
struct rx_connection * callp;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
/* now make the get acl call */
#ifdef AFS_FREELANCE_CLIENT
} else
#endif
{
- fid.Volume = scp->fid.volume;
- fid.Vnode = scp->fid.vnode;
- fid.Unique = scp->fid.unique;
+ afid.Volume = scp->fid.volume;
+ afid.Vnode = scp->fid.vnode;
+ afid.Unique = scp->fid.unique;
do {
acl.AFSOpaque_val = ioctlp->outDatap;
acl.AFSOpaque_len = 0;
if (code) continue;
callp = cm_GetRxConn(connp);
- code = RXAFS_FetchACL(callp, &fid, &acl, &fileStatus, &volSync);
+ code = RXAFS_FetchACL(callp, &afid, &acl, &fileStatus, &volSync);
rx_PutConnection(callp);
} while (cm_Analyze(connp, userp, &req, &scp->fid, &volSync, NULL, NULL, code));
cm_scache_t *scp;
cm_cell_t *cellp;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
#ifdef AFS_FREELANCE_CLIENT
if ( cm_freelanceEnabled &&
} else
#endif /* AFS_FREELANCE_CLIENT */
{
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, CM_FLAG_NOPROBE);
if (cellp) {
StringCbCopyA(ioctlp->outDatap, SMB_IOCTL_MAXDATA - (ioctlp->outDatap - ioctlp->outAllocp), cellp->name);
ioctlp->outDatap += strlen(ioctlp->outDatap) + 1;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, 0);
if (code) return code;
#ifdef AFS_FREELANCE_CLIENT
code = cm_MapRPCError(code, &req);
/* invalidate cache info, since we just trashed the ACL cache */
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_DiscardSCache(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
}
cm_ReleaseSCache(scp);
cm_InitReq(&req);
+ cm_SkipIoctlPath(ioctlp); /* we don't care about the path */
+
lock_ObtainWrite(&cm_scacheLock);
for (i=0; i<cm_data.scacheHashTableSize; i++) {
for (scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp) {
unsigned long volume;
unsigned long cell;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
-
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
+
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
code = CM_ERROR_NOACCESS;
long code;
cm_scache_t *scp;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
-
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
+
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
code = CM_ERROR_NOACCESS;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, 0);
if (code) return code;
#ifdef AFS_FREELANCE_CLIENT
} else
#endif
{
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
osi_assertx(cellp, "null cm_cell_t");
if (scp->flags & CM_SCACHEFLAG_RO) {
return CM_ERROR_READONLY;
}
- code = cm_GetVolumeByID(cellp, scp->fid.volume, userp, &req,
+ code = cm_FindVolumeByID(cellp, scp->fid.volume, userp, &req,
CM_GETVOL_FLAG_CREATE, &tvp);
if (code) {
cm_ReleaseSCache(scp);
char *MOTD;
cm_req_t req;
struct rx_connection * callp;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
register char *cp;
cm_fid_t fid;
cm_req_t req;
+ cm_ioctlQueryOptions_t * optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
if (code) return code;
memset(&fid, 0, sizeof(cm_fid_t));
+ fid.cell = scp->fid.cell;
fid.volume = scp->fid.volume;
fid.vnode = scp->fid.vnode;
fid.unique = scp->fid.unique;
return 0;
}
+long cm_IoctlGetFileType(struct smb_ioctl *ioctlp, struct cm_user *userp)
+{
+ cm_scache_t *scp;
+ register long code;
+ register char *cp;
+ afs_uint32 fileType = 0;
+ cm_req_t req;
+ cm_ioctlQueryOptions_t * optionsp;
+ afs_uint32 flags = 0;
+
+ cm_InitReq(&req);
+
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
+
+ fileType = scp->fileType;
+ cm_ReleaseSCache(scp);
+
+ /* Copy all this junk into msg->im_data, keeping track of the lengths. */
+ cp = ioctlp->outDatap;
+ memcpy(cp, (char *)&fileType, sizeof(fileType));
+ cp += sizeof(fileType);
+
+ /* return new size */
+ ioctlp->outDatap = cp;
+
+ return 0;
+}
+
long cm_IoctlGetOwner(struct smb_ioctl *ioctlp, struct cm_user *userp)
{
cm_scache_t *scp;
register long code;
register char *cp;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
/* Copy all this junk into msg->im_data, keeping track of the lengths. */
cp = ioctlp->outDatap;
unsigned long volume;
char *cp;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
-
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
+
volume = scp->fid.volume;
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
cm_ReleaseSCache(scp);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
- code = cm_GetVolumeByID(cellp, volume, userp, &req, CM_GETVOL_FLAG_CREATE, &tvp);
- if (code)
- return code;
+#ifdef AFS_FREELANCE_CLIENT
+ if ( cellp->cellID == AFS_FAKE_ROOT_CELL_ID) {
+ struct in_addr addr;
+
+ addr.s_net = 127;
+ addr.s_host = 0;
+ addr.s_lh = 0;
+ addr.s_impno = 1;
+
+ cp = ioctlp->outDatap;
+
+ memcpy(cp, (char *)&addr, sizeof(addr));
+ cp += sizeof(addr);
+
+ /* still room for terminating NULL, add it on */
+ addr.s_addr = 0;
+ memcpy(cp, (char *)&addr, sizeof(addr));
+ cp += sizeof(addr);
+
+ ioctlp->outDatap = cp;
+ } else
+#endif
+ {
+ code = cm_FindVolumeByID(cellp, volume, userp, &req, CM_GETVOL_FLAG_CREATE, &tvp);
+ if (code)
+ return code;
- cp = ioctlp->outDatap;
+ cp = ioctlp->outDatap;
- lock_ObtainMutex(&tvp->mx);
- tsrpp = cm_GetVolServers(tvp, volume);
- lock_ObtainRead(&cm_serverLock);
- for (current = *tsrpp; current; current = current->next) {
- tsp = current->server;
- memcpy(cp, (char *)&tsp->addr.sin_addr.s_addr, sizeof(long));
- cp += sizeof(long);
- }
- lock_ReleaseRead(&cm_serverLock);
- cm_FreeServerList(tsrpp, 0);
- lock_ReleaseMutex(&tvp->mx);
+ lock_ObtainMutex(&tvp->mx);
+ tsrpp = cm_GetVolServers(tvp, volume);
+ lock_ObtainRead(&cm_serverLock);
+ for (current = *tsrpp; current; current = current->next) {
+ tsp = current->server;
+ memcpy(cp, (char *)&tsp->addr.sin_addr.s_addr, sizeof(long));
+ cp += sizeof(long);
+ }
+ lock_ReleaseRead(&cm_serverLock);
+ cm_FreeServerList(tsrpp, 0);
+ lock_ReleaseMutex(&tvp->mx);
- /* still room for terminating NULL, add it on */
- volume = 0; /* reuse vbl */
- memcpy(cp, (char *)&volume, sizeof(long));
- cp += sizeof(long);
+ /* still room for terminating NULL, add it on */
+ volume = 0; /* reuse vbl */
+ memcpy(cp, (char *)&volume, sizeof(long));
+ cp += sizeof(long);
- ioctlp->outDatap = cp;
- cm_PutVolume(tvp);
+ ioctlp->outDatap = cp;
+ cm_PutVolume(tvp);
+ }
return 0;
}
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
cm_ReleaseSCache(dscp);
if (code) return code;
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
/* now check that this is a real mount point */
if (scp->fileType != CM_SCACHETYPE_MOUNTPOINT) {
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_ReleaseSCache(scp);
return CM_ERROR_INVAL;
}
cp += strlen(cp) + 1;
ioctlp->outDatap = cp;
}
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_ReleaseSCache(scp);
return code;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
goto done2;
}
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
code = cm_SyncOp(scp, NULL, userp, &req, 0,
CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
if (code) {
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_ReleaseSCache(scp);
goto done2;
}
/* now check that this is a real mount point */
if (scp->fileType != CM_SCACHETYPE_MOUNTPOINT) {
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_ReleaseSCache(scp);
code = CM_ERROR_INVAL;
goto done1;
}
/* time to make the RPC, so drop the lock */
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_ReleaseSCache(scp);
/* easier to do it this way */
dscp, cp, NULL, TRUE);
done1:
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
done2:
cm_ReleaseSCache(dscp);
*/
if (haveCell) {
/* have cell name, too */
- cellp = cm_GetCell(cp, 0);
+ cellp = cm_GetCell(cp, (temp & 1) ? CM_FLAG_NOPROBE : 0);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
}
else cellp = (cm_cell_t *) 0;
if (!cellp && (temp & 2)) {
/* use local cell */
- cellp = cm_FindCellByID(1);
+ cellp = cm_FindCellByID(1, 0);
}
if (!(temp & 1)) { /* if not fast, call server checker routine */
/* check down servers */
return CM_ERROR_NOMORETOKENS; /* mapped to EDOM */
}
-extern long cm_AddCellProc(void *rockp, struct sockaddr_in *addrp, char *namep);
-
long cm_IoctlNewCell(struct smb_ioctl *ioctlp, struct cm_user *userp)
{
/* NT cache manager will read cell information from CellServDB each time
*/
cm_cell_t *cp;
+ cm_cell_rock_t rock;
+
cm_SkipIoctlPath(ioctlp);
lock_ObtainWrite(&cm_cellLock);
/* delete all previous server lists - cm_FreeServerList will ask for write on cm_ServerLock*/
cm_FreeServerList(&cp->vlServersp, CM_FREESERVERLIST_DELETE);
cp->vlServersp = NULL;
- code = cm_SearchCellFile(cp->name, cp->name, cm_AddCellProc, cp);
+ rock.cellp = cp;
+ rock.flags = 0;
+ code = cm_SearchCellFile(cp->name, cp->name, cm_AddCellProc, &rock);
#ifdef AFS_AFSDB_ENV
if (code) {
if (cm_dnsEnabled) {
int ttl;
- code = cm_SearchCellByDNS(cp->name, cp->name, &ttl, cm_AddCellProc, cp);
+ code = cm_SearchCellByDNS(cp->name, cp->name, &ttl, cm_AddCellProc, &rock);
if ( code == 0 ) { /* got cell from DNS */
cp->flags |= CM_CELLFLAG_DNS;
cp->flags &= ~CM_CELLFLAG_VLSERVER_INVALID;
}
else /* add a new server without a cell */
{
- tsp = cm_NewServer(&tmp, type, NULL); /* refcount = 1 */
+ tsp = cm_NewServer(&tmp, type, NULL, CM_FLAG_NOPROBE); /* refcount = 1 */
tsp->ipRank = rank;
}
lock_ObtainMutex(&tsp->mx);
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
if (code)
goto done3;
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
code = cm_SyncOp(scp, NULL, userp, &req, 0,
CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
if (code)
}
/* time to make the RPC, so drop the lock */
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
/* easier to do it this way */
code = cm_Unlink(dscp, cp, userp, &req);
| FILE_NOTIFY_CHANGE_DIR_NAME,
dscp, cp, NULL, TRUE);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
done1:
cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
done2:
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_ReleaseSCache(scp);
done3:
afs_uuid_t uuid;
int flags;
char sessionKey[8];
-#ifndef AFSIFS
char *smbname;
-#endif
int release_userp = 0;
char * wdir = NULL;
tp += sizeof(int);
/* cell name */
- cellp = cm_GetCell(tp, CM_FLAG_CREATE);
+ cellp = cm_GetCell(tp, CM_FLAG_CREATE | CM_FLAG_NOPROBE);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
tp += strlen(tp) + 1;
uname = tp;
tp += strlen(tp) + 1;
-#ifndef AFSIFS /* no SMB username, so we cannot logon based on this */
if (flags & PIOCTL_LOGON) {
/* SMB user name with which to associate tokens */
smbname = tp;
osi_Log1(smb_logp,"cm_IoctlSetToken for user [%s]",
osi_LogSaveString(smb_logp, uname));
}
-#endif
/* uuid */
memcpy(&uuid, tp, sizeof(uuid));
osi_Log0(smb_logp,"cm_IoctlSetToken - no name specified");
}
-#ifndef AFSIFS
if (flags & PIOCTL_LOGON) {
userp = smb_FindCMUserByName(smbname, ioctlp->fidp->vcp->rname,
SMB_FLAG_CREATE|SMB_FLAG_AFSLOGON);
release_userp = 1;
}
-#endif /* AFSIFS */
/* store the token */
lock_ObtainMutex(&userp->mx);
cm_vol_state_t *statep;
afs_uint32 volume;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_fid_t fid;
+ cm_SkipIoctlPath(ioctlp);
+ cm_SetFid(&fid, optionsp->fid.cell, optionsp->fid.volume,
+ optionsp->fid.vnode, optionsp->fid.unique);
+ code = cm_GetSCache(&fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
if (code)
return code;
{
volume = scp->fid.volume;
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
cm_ReleaseSCache(scp);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
- code = cm_GetVolumeByID(cellp, volume, userp, &req, CM_GETVOL_FLAG_CREATE, &tvp);
+ code = cm_FindVolumeByID(cellp, volume, userp, &req, CM_GETVOL_FLAG_CREATE, &tvp);
if (code)
return code;
}
if (testp->fid.cell > 0) {
- cellp = cm_FindCellByID(testp->fid.cell);
+ cellp = cm_FindCellByID(testp->fid.cell, 0);
}
if (!cellp)
if (n)
testp->fid.volume = n;
else
- code = cm_GetVolumeByName(cellp, testp->volname, userp, &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
+ code = cm_FindVolumeByName(cellp, testp->volname, userp, &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
}
if (testp->fid.volume > 0)
- code = cm_GetVolumeByID(cellp, testp->fid.volume, userp, &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
+ code = cm_FindVolumeByID(cellp, testp->fid.volume, userp, &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
if (code)
return code;
git://git.openafs.org / openafs.git / blobdiff