#include "afs/param.h"
-#ifdef AFS_LINUX24_ENV
-#include "h/module.h" /* early to avoid printf->printk mapping */
-#endif
+#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"
-#if defined(AFS_LINUX26_ENV)
-#include "h/namei.h"
-#endif
+#include <linux/smp_lock.h>
+#include <linux/namei.h>
#if defined(LINUX_USE_FH)
-#include "h/exportfs.h"
+#include <linux/exportfs.h>
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;
-#if defined(AFS_LINUX24_ENV)
extern struct vfsmount *afs_cacheMnt;
-#endif
extern struct super_block *afs_cacheSBp;
+#if defined(STRUCT_TASK_HAS_CRED)
+extern struct cred *cache_creds;
+#endif
-#if defined(AFS_LINUX26_ENV)
-void *
-osi_UFSOpen(afs_dcache_id_t *ainode)
+struct file *
+afs_linux_raw_open(afs_dcache_id_t *ainode, ino_t *hint)
{
- struct osi_file *afile = NULL;
- extern int cacheDiskType;
struct inode *tip = NULL;
struct dentry *dp = NULL;
- struct file *filp = NULL;
+ struct file* filp;
- 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(struct AFS_UCRED));
- 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();
- 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));
#if !defined(LINUX_USE_FH)
tip = iget(afs_cacheSBp, ainode->ufs);
if (!tip)
- osi_Panic("Can't get inode %d\n", ainode->ufs);
+ 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)
- osi_Panic("Can't get dentry\n");
+ dp = afs_cacheSBp->s_export_op->fh_to_dentry(afs_cacheSBp, &ainode->ufs.fh,
+ cache_fh_len, cache_fh_type);
+ if (!dp)
+ osi_Panic("Can't get dentry\n");
tip = dp->d_inode;
#endif
tip->i_flags |= MS_NOATIME; /* Disable updating access times. */
#if defined(STRUCT_TASK_HAS_CRED)
- filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, current_cred());
+ /* Use stashed credentials - prevent selinux/apparmor problems */
+ filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, cache_creds);
#else
filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR);
#endif
#if defined(LINUX_USE_FH)
osi_Panic("Can't open file\n");
#else
- osi_Panic("Can't open inode %d\n", ainode->ufs);
+ osi_Panic("Can't open inode %d\n", (int) ainode->ufs);
#endif
- afile->filp = filp;
- afile->size = i_size_read(FILE_INODE(filp));
- AFS_GLOCK();
- afile->offset = 0;
- afile->proc = (int (*)())0;
- afile->inum = tip->i_ino; /* for hint validity checking */
- return (void *)afile;
+ if (hint)
+ *hint = tip->i_ino;
+ return filp;
}
-#else
+
void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
- register struct osi_file *afile = NULL;
+ struct osi_file *afile = NULL;
extern int cacheDiskType;
- afs_int32 code = 0;
- struct inode *tip = NULL;
- 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(struct 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;
}
AFS_GUNLOCK();
if (!afile) {
osi_Panic("osi_UFSOpen: Failed to allocate %d bytes for osi_file.\n",
- sizeof(struct osi_file));
+ (int)sizeof(struct osi_file));
}
memset(afile, 0, sizeof(struct osi_file));
- filp = &afile->file;
- filp->f_dentry = &afile->dentry;
- tip = iget(afs_cacheSBp, ainode->ufs);
- if (!tip)
- osi_Panic("Can't get inode %d\n", ainode->ufs);
- FILE_INODE(filp) = tip;
- tip->i_flags |= MS_NOATIME; /* Disable updating access times. */
- filp->f_flags = O_RDWR;
-#if defined(AFS_LINUX24_ENV)
- filp->f_mode = FMODE_READ|FMODE_WRITE;
- filp->f_op = fops_get(tip->i_fop);
-#else
- filp->f_op = tip->i_op->default_file_ops;
-#endif
- if (filp->f_op && filp->f_op->open)
- code = filp->f_op->open(tip, filp);
- if (code)
- osi_Panic("Can't open inode %d\n", ainode->ufs);
- afile->size = i_size_read(tip);
+
+ afile->filp = afs_linux_raw_open(ainode, &afile->inum);
+ afile->size = i_size_read(FILE_INODE(afile->filp));
AFS_GLOCK();
afile->offset = 0;
afile->proc = (int (*)())0;
- afile->inum = ainode->ufs; /* for hint validity checking */
return (void *)afile;
}
-#endif
#if defined(LINUX_USE_FH)
/*
int
afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
{
- register afs_int32 code;
AFS_STATCNT(osi_Stat);
- MObtainWriteLock(&afs_xosi, 320);
+ ObtainWriteLock(&afs_xosi, 320);
astat->size = i_size_read(OSIFILE_INODE(afile));
-#if defined(AFS_LINUX26_ENV)
astat->mtime = OSIFILE_INODE(afile)->i_mtime.tv_sec;
astat->atime = OSIFILE_INODE(afile)->i_atime.tv_sec;
-#else
- astat->mtime = OSIFILE_INODE(afile)->i_mtime;
- astat->atime = OSIFILE_INODE(afile)->i_atime;
-#endif
- code = 0;
- MReleaseWriteLock(&afs_xosi);
- return code;
+
+ ReleaseWriteLock(&afs_xosi);
+ return 0;
}
-#ifdef AFS_LINUX26_ENV
int
osi_UFSClose(register struct osi_file *afile)
{
osi_FreeLargeSpace(afile);
return 0;
}
-#else
-int
-osi_UFSClose(register struct osi_file *afile)
-{
- AFS_STATCNT(osi_Close);
- if (afile) {
- if (FILE_INODE(&afile->file)) {
- struct file *filp = &afile->file;
- if (filp->f_op && filp->f_op->release)
- filp->f_op->release(FILE_INODE(filp), filp);
- iput(FILE_INODE(filp));
- }
- }
-
- osi_FreeLargeSpace(afile);
- return 0;
-}
-#endif
int
osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize)
code = afs_osi_Stat(afile, &tstat);
if (code || tstat.size <= asize)
return code;
- MObtainWriteLock(&afs_xosi, 321);
+ ObtainWriteLock(&afs_xosi, 321);
AFS_GUNLOCK();
-#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
+#ifdef STRUCT_INODE_HAS_I_ALLOC_SEM
+ down_write(&inode->i_alloc_sem);
+#endif
newattrs.ia_size = asize;
newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-#if defined(AFS_LINUX24_ENV)
newattrs.ia_ctime = CURRENT_TIME;
/* avoid notify_change() since it wants to update dentry->d_parent */
code = inode_change_ok(inode, &newattrs);
if (!code) {
#ifdef INODE_SETATTR_NOT_VOID
-#if defined(AFS_LINUX26_ENV)
if (inode->i_op && inode->i_op->setattr)
code = inode->i_op->setattr(afile->filp->f_dentry, &newattrs);
else
-#endif
code = inode_setattr(inode, &newattrs);
#else
inode_setattr(inode, &newattrs);
unlock_kernel();
if (!code)
truncate_inode_pages(&inode->i_data, asize);
-#else
- i_size_write(inode, asize);
- if (inode->i_sb->s_op && inode->i_sb->s_op->notify_change) {
- code = inode->i_sb->s_op->notify_change(&afile->dentry, &newattrs);
- }
- if (!code) {
- truncate_inode_pages(inode, asize);
- if (inode->i_op && inode->i_op->truncate)
- inode->i_op->truncate(inode);
- }
-#endif
code = -code;
+#ifdef STRUCT_INODE_HAS_I_ALLOC_SEM
+ up_write(&inode->i_alloc_sem);
+#endif
#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_GLOCK();
- MReleaseWriteLock(&afs_xosi);
+ ReleaseWriteLock(&afs_xosi);
return code;
}
int
osi_rdwr(struct osi_file *osifile, uio_t * uiop, int rw)
{
-#ifdef AFS_LINUX26_ENV
struct file *filp = osifile->filp;
-#else
- struct file *filp = &osifile->file;
-#endif
KERNEL_SPACE_DECL;
int code = 0;
struct iovec *iov;
git://git.openafs.org / openafs.git / blobdiff