#include "afs/param.h"
-#include "h/module.h" /* early to avoid printf->printk mapping */
+#include <linux/module.h> /* early to avoid printf->printk mapping */
#include "afs/sysincludes.h" /* Standard vendor system headers */
#include "afsincludes.h" /* Afs-based standard headers */
#include "afs/afs_stats.h" /* afs statistics */
-#include "h/smp_lock.h"
-#include "h/namei.h"
-#if defined(LINUX_USE_FH)
-#include "h/exportfs.h"
+#include <linux/namei.h>
+
+#if defined(HAVE_LINUX_EXPORTFS_H)
+#include <linux/exportfs.h>
+#endif
+#include "osi_compat.h"
+
+#ifndef CURRENT_TIME
+#define CURRENT_TIME (current_kernel_time())
+#endif
+
int cache_fh_type = -1;
int cache_fh_len = -1;
-#endif
afs_lock_t afs_xosi; /* lock is for tvattr */
extern struct osi_dev cacheDev;
extern struct vfsmount *afs_cacheMnt;
extern struct super_block *afs_cacheSBp;
+#if defined(STRUCT_TASK_STRUCT_HAS_CRED)
+extern struct cred *cache_creds;
+#endif
+
+/* Old export ops: decode_fh will call back here. Accept any dentry it suggests */
+int
+afs_fh_acceptable(void *context, struct dentry *dp)
+{
+ return 1;
+}
struct file *
-afs_linux_raw_open(afs_dcache_id_t *ainode, ino_t *hint)
+afs_linux_raw_open(afs_dcache_id_t *ainode)
{
struct inode *tip = NULL;
struct dentry *dp = NULL;
struct file* filp;
-#if !defined(LINUX_USE_FH)
- tip = iget(afs_cacheSBp, ainode->ufs);
- if (!tip)
- osi_Panic("Can't get inode %d\n", (int) ainode->ufs);
-
- dp = d_alloc_anon(tip);
-#else
- dp = afs_cacheSBp->s_export_op->fh_to_dentry(afs_cacheSBp, &ainode->ufs.fh,
- cache_fh_len, cache_fh_type);
- if (!dp)
+ dp = afs_get_dentry_from_fh(afs_cacheSBp, ainode, cache_fh_len, cache_fh_type,
+ afs_fh_acceptable);
+ if ((!dp) || IS_ERR(dp))
osi_Panic("Can't get dentry\n");
tip = dp->d_inode;
-#endif
- tip->i_flags |= MS_NOATIME; /* Disable updating access times. */
+ tip->i_flags |= S_NOATIME; /* Disable updating access times. */
-#if defined(STRUCT_TASK_HAS_CRED)
- filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, current_cred());
-#else
- filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR);
-#endif
+#if defined(STRUCT_TASK_STRUCT_HAS_CRED)
+ /* Use stashed credentials - prevent selinux/apparmor problems */
+ filp = afs_dentry_open(dp, afs_cacheMnt, O_RDWR, cache_creds);
if (IS_ERR(filp))
-#if defined(LINUX_USE_FH)
- osi_Panic("Can't open file\n");
+ filp = afs_dentry_open(dp, afs_cacheMnt, O_RDWR, current_cred());
#else
- osi_Panic("Can't open inode %d\n", (int) ainode->ufs);
+ filp = dentry_open(dget(dp), mntget(afs_cacheMnt), O_RDWR);
#endif
- if (hint)
- *hint = tip->i_ino;
+ if (IS_ERR(filp))
+ osi_Panic("Can't open file: %d\n", (int) PTR_ERR(filp));
+
+ dput(dp);
+
return filp;
}
{
struct osi_file *afile = NULL;
extern int cacheDiskType;
- struct file *filp = NULL;
+
AFS_STATCNT(osi_UFSOpen);
if (cacheDiskType != AFS_FCACHE_TYPE_UFS) {
osi_Panic("UFSOpen called for non-UFS cache\n");
}
if (!afs_osicred_initialized) {
/* valid for alpha_osf, SunOS, Ultrix */
- memset((char *)&afs_osi_cred, 0, sizeof(AFS_UCRED));
+ memset(&afs_osi_cred, 0, sizeof(afs_ucred_t));
crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */
afs_osicred_initialized = 1;
}
- afile = (struct osi_file *)osi_AllocLargeSpace(sizeof(struct osi_file));
AFS_GUNLOCK();
+ afile = kmalloc(sizeof(struct osi_file), GFP_NOFS);
if (!afile) {
osi_Panic("osi_UFSOpen: Failed to allocate %d bytes for osi_file.\n",
(int)sizeof(struct osi_file));
}
memset(afile, 0, sizeof(struct osi_file));
- afile->filp = afs_linux_raw_open(ainode, &afile->inum);
+ afile->filp = afs_linux_raw_open(ainode);
afile->size = i_size_read(FILE_INODE(afile->filp));
AFS_GLOCK();
afile->offset = 0;
return (void *)afile;
}
-#if defined(LINUX_USE_FH)
/*
* Given a dentry, return the file handle as encoded by the filesystem.
* We can't assume anything about the length (words, not bytes).
max_len = cache_fh_len;
else
max_len = MAX_FH_LEN;
- if (dp->d_sb->s_export_op->encode_fh) {
- type = dp->d_sb->s_export_op->encode_fh(dp, &ainode->raw[0], &max_len, 0);
- if (type == 255) {
- osi_Panic("File handle encoding failed\n");
- }
- if (cache_fh_type < 0)
- cache_fh_type = type;
- if (cache_fh_len < 0) {
- cache_fh_len = max_len;
- }
- if (type != cache_fh_type || max_len != cache_fh_len) {
- osi_Panic("Inconsistent file handles within cache\n");
- }
- } else {
- /* If fs doesn't provide an encode_fh method, assume the default INO32 type */
- if (cache_fh_type < 0)
- cache_fh_type = FILEID_INO32_GEN;
- if (cache_fh_len < 0)
- cache_fh_len = sizeof(struct fid)/4;
- ainode->fh.i32.ino = dp->d_inode->i_ino;
- ainode->fh.i32.gen = dp->d_inode->i_generation;
+ type = afs_get_fh_from_dentry(dp, ainode, &max_len);
+ if (type == 255) {
+ osi_Panic("File handle encoding failed\n");
+ }
+ if (cache_fh_type < 0)
+ cache_fh_type = type;
+ if (cache_fh_len < 0) {
+ cache_fh_len = max_len;
+ }
+ if (type != cache_fh_type || max_len != cache_fh_len) {
+ osi_Panic("Inconsistent file handles within cache\n");
}
}
-#else
-void osi_get_fh(struct dentry *dp, afs_ufs_dcache_id_t *ainode) {
- *ainode = dp->d_inode->i_ino;
-}
-#endif
int
-afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
+afs_osi_Stat(struct osi_file *afile, struct osi_stat *astat)
{
AFS_STATCNT(osi_Stat);
- MObtainWriteLock(&afs_xosi, 320);
+ ObtainWriteLock(&afs_xosi, 320);
astat->size = i_size_read(OSIFILE_INODE(afile));
astat->mtime = OSIFILE_INODE(afile)->i_mtime.tv_sec;
astat->atime = OSIFILE_INODE(afile)->i_atime.tv_sec;
- MReleaseWriteLock(&afs_xosi);
+ ReleaseWriteLock(&afs_xosi);
return 0;
}
int
-osi_UFSClose(register struct osi_file *afile)
+osi_UFSClose(struct osi_file *afile)
{
AFS_STATCNT(osi_Close);
if (afile) {
filp_close(afile->filp, NULL);
}
}
-
- osi_FreeLargeSpace(afile);
+ kfree(afile);
return 0;
}
int
-osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize)
+osi_UFSTruncate(struct osi_file *afile, afs_int32 asize)
{
- register afs_int32 code;
+ afs_int32 code;
struct osi_stat tstat;
struct iattr newattrs;
struct inode *inode = OSIFILE_INODE(afile);
code = afs_osi_Stat(afile, &tstat);
if (code || tstat.size <= asize)
return code;
- MObtainWriteLock(&afs_xosi, 321);
+ ObtainWriteLock(&afs_xosi, 321);
AFS_GUNLOCK();
+ afs_linux_lock_inode(inode);
#ifdef STRUCT_INODE_HAS_I_ALLOC_SEM
down_write(&inode->i_alloc_sem);
#endif
-#ifdef STRUCT_INODE_HAS_I_MUTEX
- mutex_lock(&inode->i_mutex);
-#else
- down(&inode->i_sem);
-#endif
newattrs.ia_size = asize;
newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
newattrs.ia_ctime = CURRENT_TIME;
/* avoid notify_change() since it wants to update dentry->d_parent */
- lock_kernel();
- code = inode_change_ok(inode, &newattrs);
- if (!code) {
-#ifdef INODE_SETATTR_NOT_VOID
- if (inode->i_op && inode->i_op->setattr)
- code = inode->i_op->setattr(afile->filp->f_dentry, &newattrs);
- else
- code = inode_setattr(inode, &newattrs);
+#ifdef HAVE_LINUX_SETATTR_PREPARE
+ code = setattr_prepare(file_dentry(afile->filp), &newattrs);
#else
- inode_setattr(inode, &newattrs);
+ code = inode_change_ok(inode, &newattrs);
#endif
- }
- unlock_kernel();
+ if (!code)
+ code = afs_inode_setattr(afile, &newattrs);
if (!code)
truncate_inode_pages(&inode->i_data, asize);
code = -code;
-#ifdef STRUCT_INODE_HAS_I_MUTEX
- mutex_unlock(&inode->i_mutex);
-#else
- up(&inode->i_sem);
-#endif
#ifdef STRUCT_INODE_HAS_I_ALLOC_SEM
up_write(&inode->i_alloc_sem);
#endif
+ afs_linux_unlock_inode(inode);
AFS_GLOCK();
- MReleaseWriteLock(&afs_xosi);
+ ReleaseWriteLock(&afs_xosi);
return code;
}
/* Generic read interface */
int
-afs_osi_Read(register struct osi_file *afile, int offset, void *aptr,
+afs_osi_Read(struct osi_file *afile, int offset, void *aptr,
afs_int32 asize)
{
struct uio auio;
struct iovec iov;
afs_int32 code;
+ memset(&auio, 0, sizeof(auio));
+ memset(&iov, 0, sizeof(iov));
+
AFS_STATCNT(osi_Read);
/*
* down. No point in crashing when we are already shutting down
*/
if (!afile) {
- if (!afs_shuttingdown)
+ if (afs_shuttingdown == AFS_RUNNING)
osi_Panic("osi_Read called with null param");
else
- return EIO;
+ return -EIO;
}
if (offset != -1)
} else {
afs_Trace2(afs_iclSetp, CM_TRACE_READFAILED, ICL_TYPE_INT32, auio.uio_resid,
ICL_TYPE_INT32, code);
- code = -1;
+ if (code > 0) {
+ code = -code;
+ }
}
return code;
}
/* Generic write interface */
int
-afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr,
+afs_osi_Write(struct osi_file *afile, afs_int32 offset, void *aptr,
afs_int32 asize)
{
struct uio auio;
struct iovec iov;
afs_int32 code;
+ memset(&auio, 0, sizeof(auio));
+ memset(&iov, 0, sizeof(iov));
+
AFS_STATCNT(osi_Write);
if (!afile) {
- if (!afs_shuttingdown)
+ if (afs_shuttingdown == AFS_RUNNING)
osi_Panic("afs_osi_Write called with null param");
else
- return EIO;
+ return -EIO;
}
if (offset != -1)
if (code == ENOSPC)
afs_warnuser
("\n\n\n*** Cache partition is FULL - Decrease cachesize!!! ***\n\n");
- code = -1;
+ if (code > 0) {
+ code = -code;
+ }
}
if (afile->proc)
This routine written from the RT NFS port strategy routine.
It has been generalized a bit, but should still be pretty clear. */
int
-afs_osi_MapStrategy(int (*aproc) (struct buf * bp), register struct buf *bp)
+afs_osi_MapStrategy(int (*aproc) (struct buf * bp), struct buf *bp)
{
afs_int32 returnCode;
dput(dp);
+ afs_init_sb_export_ops(afs_cacheSBp);
+
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)
+osi_rdwr(struct osi_file *osifile, struct uio *uiop, int rw)
{
struct file *filp = osifile->filp;
- KERNEL_SPACE_DECL;
+ mm_segment_t old_fs = {0};
int code = 0;
struct iovec *iov;
- afs_size_t count;
+ size_t count;
unsigned long savelim;
+ loff_t pos;
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;
+ if (uiop->uio_seg == AFS_UIOSYS) {
+ /* Switch into user space */
+ old_fs = get_fs();
+ set_fs(get_ds());
+ }
while (code == 0 && uiop->uio_resid > 0 && uiop->uio_iovcnt > 0) {
iov = uiop->uio_iov;
continue;
}
+ pos = uiop->uio_offset;
if (rw == UIO_READ)
- code = FOP_READ(filp, iov->iov_base, count);
+ code = afs_file_read(filp, iov->iov_base, count, &pos);
else
- code = FOP_WRITE(filp, iov->iov_base, count);
+ code = afs_file_write(filp, iov->iov_base, count, &pos);
if (code < 0) {
code = -code;
code = 0;
}
- if (uiop->uio_seg == AFS_UIOSYS)
- TO_KERNEL_SPACE();
+ if (uiop->uio_seg == AFS_UIOSYS) {
+ /* Switch back into kernel space */
+ set_fs(old_fs);
+ }
current->TASK_STRUCT_RLIM[RLIMIT_FSIZE].rlim_cur = savelim;
* Setup a uio struct.
*/
void
-setup_uio(uio_t * uiop, struct iovec *iovecp, const char *buf, afs_offs_t pos,
+setup_uio(struct uio *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;
* UIO_WRITE : uio -> dp
*/
int
-uiomove(char *dp, int length, uio_flag_t rw, uio_t * uiop)
+uiomove(char *dp, int length, uio_flag_t rw, struct uio *uiop)
{
int count;
struct iovec *iov;
git://git.openafs.org / openafs.git / blobdiff