#include <afsconfig.h>
#include "afs/param.h"
-RCSID
- ("$Header$");
+#include <linux/module.h> /* early to avoid printf->printk mapping */
+#include <linux/dcache.h>
+#include <linux/namei.h>
+#include <linux/kthread.h>
#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "afs/afs_stats.h"
-#if defined(AFS_LINUX24_ENV)
-#include "h/smp_lock.h"
-#endif
-#if defined(AFS_LINUX26_ENV)
-#include "h/namei.h"
-#endif
-#if defined(AFS_LINUX24_ENV)
+#include "osi_compat.h"
+
+int afs_osicred_initialized = 0;
+afs_ucred_t afs_osi_cred;
+
+void
+afs_osi_SetTime(osi_timeval_t * tvp)
+{
+ struct timespec tv;
+ tv.tv_sec = tvp->tv_sec;
+ tv.tv_nsec = tvp->tv_usec * NSEC_PER_USEC;
+
+ AFS_STATCNT(osi_SetTime);
+
+ do_settimeofday(&tv);
+}
+
+void
+osi_linux_mask(void)
+{
+ SIG_LOCK(current);
+ sigfillset(¤t->blocked);
+ RECALC_SIGPENDING(current);
+ SIG_UNLOCK(current);
+}
+
/* LOOKUP_POSITIVE is becoming the default */
#ifndef LOOKUP_POSITIVE
#define LOOKUP_POSITIVE 0
struct dentry **dpp)
{
int code;
- struct nameidata nd;
+#if defined(HAVE_LINUX_PATH_LOOKUP)
+ struct nameidata path_data;
+#else
+ afs_linux_path_t path_data;
+#endif
int flags = LOOKUP_POSITIVE;
- code = ENOENT;
if (followlink)
flags |= LOOKUP_FOLLOW;
-#if defined(AFS_LINUX26_ENV)
- code = path_lookup(aname, flags, &nd);
-#else
- if (path_init(aname, flags, &nd))
- code = path_walk(aname, &nd);
-#endif
+ code = afs_kern_path(aname, flags, &path_data);
+
+ if (!code)
+ afs_get_dentry_ref(&path_data, mnt, dpp);
- if (!code) {
- *dpp = dget(nd.dentry);
- if (mnt)
- *mnt = mntget(nd.mnt);
- path_release(&nd);
- }
return code;
}
-int
-osi_lookupname(char *aname, uio_seg_t seg, int followlink,
- struct dentry **dpp)
+
+static char *
+afs_getname(char *aname)
{
- int code;
- char *tname;
- code = ENOENT;
- if (seg == AFS_UIOUSER) {
- tname = getname(aname);
- if (IS_ERR(tname))
- return PTR_ERR(tname);
- } else {
- tname = aname;
+ int len;
+ char *name = kmem_cache_alloc(names_cachep, GFP_KERNEL);
+
+ if (!name)
+ return ERR_PTR(-ENOMEM);
+
+ len = strncpy_from_user(name, aname, PATH_MAX);
+ if (len < 0)
+ goto error;
+ if (len >= PATH_MAX) {
+ len = -ENAMETOOLONG;
+ goto error;
}
- code = osi_lookupname_internal(tname, followlink, NULL, dpp);
- if (seg == AFS_UIOUSER) {
- putname(tname);
- }
- return code;
+ return name;
+
+error:
+ kmem_cache_free(names_cachep, name);
+ return ERR_PTR(len);
}
-#else
+
+static void
+afs_putname(char *name)
+{
+ kmem_cache_free(names_cachep, name);
+}
+
int
-osi_lookupname(char *aname, uio_seg_t seg, int followlink, struct dentry **dpp)
+osi_lookupname(char *aname, uio_seg_t seg, int followlink,
+ struct dentry **dpp)
{
- struct dentry *dp = NULL;
int code;
+ char *name;
- code = ENOENT;
if (seg == AFS_UIOUSER) {
- dp = followlink ? namei(aname) : lnamei(aname);
+ name = afs_getname(aname);
+ if (IS_ERR(name))
+ return -PTR_ERR(name);
} else {
- dp = lookup_dentry(aname, NULL, followlink ? 1 : 0);
+ name = aname;
}
-
- if (dp && !IS_ERR(dp)) {
- if (dp->d_inode) {
- *dpp = dp;
- code = 0;
- } else
- dput(dp);
+ code = osi_lookupname_internal(name, followlink, NULL, dpp);
+ if (seg == AFS_UIOUSER) {
+ afs_putname(name);
}
-
return code;
}
-#endif
-/* Intialize cache device info and fragment size for disk cache partition. */
-int
-osi_InitCacheInfo(char *aname)
+int osi_abspath(char *aname, char *buf, int buflen,
+ int followlink, char **pathp)
{
+ struct dentry *dp = NULL;
+ struct vfsmount *mnt = NULL;
+ char *name, *path;
int code;
- struct dentry *dp;
- extern ino_t cacheInode;
- extern struct osi_dev cacheDev;
- extern afs_int32 afs_fsfragsize;
- extern struct super_block *afs_cacheSBp;
- extern struct vfsmount *afs_cacheMnt;
- code = osi_lookupname_internal(aname, 1, &afs_cacheMnt, &dp);
- if (code)
- return ENOENT;
-
- cacheInode = dp->d_inode->i_ino;
- cacheDev.dev = dp->d_inode->i_sb->s_dev;
- afs_fsfragsize = dp->d_inode->i_sb->s_blocksize - 1;
- afs_cacheSBp = dp->d_inode->i_sb;
-
- dput(dp);
-
- return 0;
-}
-
-#define FOP_READ(F, B, C) (F)->f_op->read(F, B, (size_t)(C), &(F)->f_pos)
-#define FOP_WRITE(F, B, C) (F)->f_op->write(F, B, (size_t)(C), &(F)->f_pos)
-
-/* osi_rdwr
- * seek, then read or write to an open inode. addrp points to data in
- * kernel space.
- */
-int
-osi_rdwr(struct osi_file *osifile, uio_t * uiop, int rw)
-{
-#ifdef AFS_LINUX26_ENV
- struct file *filp = osifile->filp;
+ name = afs_getname(aname);
+ if (IS_ERR(name))
+ return -PTR_ERR(name);
+ code = osi_lookupname_internal(name, followlink, &mnt, &dp);
+ if (!code) {
+#if defined(D_PATH_TAKES_STRUCT_PATH)
+ afs_linux_path_t p = { .mnt = mnt, .dentry = dp };
+ path = d_path(&p, buf, buflen);
#else
- struct file *filp = &osifile->file;
+ path = d_path(dp, mnt, buf, buflen);
#endif
- KERNEL_SPACE_DECL;
- int code = 0;
- struct iovec *iov;
- afs_size_t count;
- unsigned long savelim;
-
- savelim = current->TASK_STRUCT_RLIM[RLIMIT_FSIZE].rlim_cur;
- current->TASK_STRUCT_RLIM[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
- if (uiop->uio_seg == AFS_UIOSYS)
- TO_USER_SPACE();
-
- /* seek to the desired position. Return -1 on error. */
- if (filp->f_op->llseek) {
- if (filp->f_op->llseek(filp, (loff_t) uiop->uio_offset, 0) != uiop->uio_offset)
- return -1;
- } else
- filp->f_pos = uiop->uio_offset;
-
- while (code == 0 && uiop->uio_resid > 0 && uiop->uio_iovcnt > 0) {
- iov = uiop->uio_iov;
- count = iov->iov_len;
- if (count == 0) {
- uiop->uio_iov++;
- uiop->uio_iovcnt--;
- continue;
- }
-
- if (rw == UIO_READ)
- code = FOP_READ(filp, iov->iov_base, count);
- else
- code = FOP_WRITE(filp, iov->iov_base, count);
-
- if (code < 0) {
- code = -code;
- break;
- } else if (code == 0) {
- /*
- * This is bad -- we can't read any more data from the
- * file, but we have no good way of signaling a partial
- * read either.
- */
- code = EIO;
- break;
+ if (IS_ERR(path)) {
+ code = -PTR_ERR(path);
+ } else {
+ *pathp = path;
}
- iov->iov_base += code;
- iov->iov_len -= code;
- uiop->uio_resid -= code;
- uiop->uio_offset += code;
- code = 0;
+ dput(dp);
+ mntput(mnt);
}
- if (uiop->uio_seg == AFS_UIOSYS)
- TO_KERNEL_SPACE();
-
- current->TASK_STRUCT_RLIM[RLIMIT_FSIZE].rlim_cur = savelim;
-
+ afs_putname(name);
return code;
}
-/* setup_uio
- * Setup a uio struct.
- */
-void
-setup_uio(uio_t * uiop, struct iovec *iovecp, const char *buf, afs_offs_t pos,
- int count, uio_flag_t flag, uio_seg_t seg)
-{
- iovecp->iov_base = (char *)buf;
- iovecp->iov_len = count;
- uiop->uio_iov = iovecp;
- uiop->uio_iovcnt = 1;
- uiop->uio_offset = pos;
- uiop->uio_seg = seg;
- uiop->uio_resid = count;
- uiop->uio_flag = flag;
-}
-
-/* uiomove
- * UIO_READ : dp -> uio
- * UIO_WRITE : uio -> dp
- */
-int
-uiomove(char *dp, int length, uio_flag_t rw, uio_t * uiop)
+/* This could use some work, and support on more platforms. */
+int afs_thread_wrapper(void *rock)
{
- int count;
- struct iovec *iov;
- int code;
-
- while (length > 0 && uiop->uio_resid > 0 && uiop->uio_iovcnt > 0) {
- iov = uiop->uio_iov;
- count = iov->iov_len;
-
- if (!count) {
- uiop->uio_iov++;
- uiop->uio_iovcnt--;
- continue;
- }
-
- if (count > length)
- count = length;
-
- switch (uiop->uio_seg) {
- case AFS_UIOSYS:
- switch (rw) {
- case UIO_READ:
- memcpy(iov->iov_base, dp, count);
- break;
- case UIO_WRITE:
- memcpy(dp, iov->iov_base, count);
- break;
- default:
- printf("uiomove: Bad rw = %d\n", rw);
- return -EINVAL;
- }
- break;
- case AFS_UIOUSER:
- switch (rw) {
- case UIO_READ:
- AFS_COPYOUT(dp, iov->iov_base, count, code);
- break;
- case UIO_WRITE:
- AFS_COPYIN(iov->iov_base, dp, count, code);
- break;
- default:
- printf("uiomove: Bad rw = %d\n", rw);
- return -EINVAL;
- }
- break;
- default:
- printf("uiomove: Bad seg = %d\n", uiop->uio_seg);
- return -EINVAL;
- }
-
- dp += count;
- length -= count;
- iov->iov_base += count;
- iov->iov_len -= count;
- uiop->uio_offset += count;
- uiop->uio_resid -= count;
- }
+ void (*proc)(void) = rock;
+ __module_get(THIS_MODULE);
+ AFS_GLOCK();
+ (*proc)();
+ AFS_GUNLOCK();
+ module_put(THIS_MODULE);
return 0;
}
-void
-afs_osi_SetTime(osi_timeval_t * tvp)
-{
-#if defined(AFS_LINUX24_ENV)
-
-#if defined(AFS_LINUX26_ENV)
- struct timespec tv;
- tv.tv_sec = tvp->tv_sec;
- tv.tv_nsec = tvp->tv_usec * NSEC_PER_USEC;
-#else
- struct timeval tv;
- tv.tv_sec = tvp->tv_sec;
- tv.tv_usec = tvp->tv_usec;
-#endif
-
- AFS_STATCNT(osi_SetTime);
-
- do_settimeofday(&tv);
-#else
- extern int (*sys_settimeofdayp) (struct timeval * tv,
- struct timezone * tz);
-
- KERNEL_SPACE_DECL;
-
- AFS_STATCNT(osi_SetTime);
-
- TO_USER_SPACE();
- if (sys_settimeofdayp)
- (void)(*sys_settimeofdayp) (tvp, NULL);
- TO_KERNEL_SPACE();
-#endif
-}
-
-/* osi_linux_free_inode_pages
- *
- * Free all vnodes remaining in the afs hash. Must be done before
- * shutting down afs and freeing all memory.
- */
-void
-osi_linux_free_inode_pages(void)
-{
- int i;
- struct vcache *tvc, *nvc;
- extern struct vcache *afs_vhashT[VCSIZE];
-
- for (i = 0; i < VCSIZE; i++) {
- for (tvc = afs_vhashT[i]; tvc; ) {
- int slept;
-
- nvc = tvc->hnext;
- if (afs_FlushVCache(tvc, &slept)) /* slept always 0 for linux? */
- printf("Failed to invalidate all pages on inode 0x%p\n", tvc);
- tvc = nvc;
- }
- }
-}
-
-struct task_struct *rxk_ListenerTask;
-
-void
-osi_linux_mask(void)
-{
- SIG_LOCK(current);
- sigfillset(¤t->blocked);
- RECALC_SIGPENDING(current);
- SIG_UNLOCK(current);
-}
-
-void
-osi_linux_rxkreg(void)
+void afs_start_thread(void (*proc)(void), char *name)
{
- rxk_ListenerTask = current;
+ kthread_run(afs_thread_wrapper, proc, "%s", name);
}
git://git.openafs.org / openafs.git / blobdiff