#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "afs/afs_stats.h"
-#include "afs/afs_osidnlc.h"
#include "h/mm.h"
#ifdef HAVE_MM_INLINE_H
#include "h/mm_inline.h"
#endif
extern struct vcache *afs_globalVp;
-extern afs_rwlock_t afs_xvcache;
-
-#if defined(AFS_LINUX24_ENV)
-extern struct inode_operations afs_file_iops;
-extern struct address_space_operations afs_file_aops;
-struct address_space_operations afs_symlink_aops;
-#endif
-extern struct inode_operations afs_dir_iops;
-extern struct inode_operations afs_symlink_iops;
static ssize_t
afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp)
{
ssize_t code;
- struct vcache *vcp = ITOAFS(fp->f_dentry->d_inode);
+ struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode);
cred_t *credp = crref();
struct vrequest treq;
if (code)
code = -code;
else {
-#ifdef AFS_64BIT_CLIENT
- if (*offp + count > afs_vmMappingEnd) {
- uio_t tuio;
- struct iovec iov;
- afs_int32 xfered = 0;
-
- if (*offp < afs_vmMappingEnd) {
- /* special case of a buffer crossing the VM mapping end */
- afs_int32 tcount = afs_vmMappingEnd - *offp;
- count -= tcount;
- osi_FlushPages(vcp, credp); /* ensure stale pages are gone */
- AFS_GUNLOCK();
- code = generic_file_read(fp, buf, tcount, offp);
- AFS_GLOCK();
- if (code != tcount) {
- goto done;
- }
- xfered = tcount;
- }
- setup_uio(&tuio, &iov, buf + xfered, (afs_offs_t) * offp, count,
- UIO_READ, AFS_UIOSYS);
- code = afs_read(vcp, &tuio, credp, 0, 0, 0);
- xfered += count - tuio.uio_resid;
- if (code != 0) {
- afs_Trace4(afs_iclSetp, CM_TRACE_READOP, ICL_TYPE_POINTER,
- vcp, ICL_TYPE_OFFSET, offp, ICL_TYPE_INT32, -1,
- ICL_TYPE_INT32, code);
- code = xfered;
- *offp += count - tuio.uio_resid;
- } else {
- code = xfered;
- *offp += count;
- }
- done:
- ;
- } else {
-#endif /* AFS_64BIT_CLIENT */
osi_FlushPages(vcp, credp); /* ensure stale pages are gone */
AFS_GUNLOCK();
code = generic_file_read(fp, buf, count, offp);
AFS_GLOCK();
-#ifdef AFS_64BIT_CLIENT
- }
-#endif /* AFS_64BIT_CLIENT */
}
afs_Trace4(afs_iclSetp, CM_TRACE_READOP, ICL_TYPE_POINTER, vcp,
{
ssize_t code = 0;
int code2 = 0;
- struct vcache *vcp = ITOAFS(fp->f_dentry->d_inode);
+ struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode);
struct vrequest treq;
cred_t *credp = crref();
- afs_offs_t toffs;
AFS_GLOCK();
if (code)
code = -code;
else {
-#ifdef AFS_64BIT_CLIENT
- toffs = *offp;
- if (fp->f_flags & O_APPEND)
- toffs += vcp->m.Length;
- if (toffs + count > afs_vmMappingEnd) {
- uio_t tuio;
- struct iovec iov;
- afs_size_t oldOffset = *offp;
- afs_int32 xfered = 0;
-
- if (toffs < afs_vmMappingEnd) {
- /* special case of a buffer crossing the VM mapping end */
- afs_int32 tcount = afs_vmMappingEnd - *offp;
- count -= tcount;
- AFS_GUNLOCK();
- code = generic_file_write(fp, buf, tcount, offp);
- AFS_GLOCK();
- if (code != tcount) {
- goto done;
- }
- xfered = tcount;
- toffs += tcount;
- }
- setup_uio(&tuio, &iov, buf + xfered, (afs_offs_t) toffs, count,
- UIO_WRITE, AFS_UIOSYS);
- code = afs_write(vcp, &tuio, fp->f_flags, credp, 0);
- xfered += count - tuio.uio_resid;
- if (code != 0) {
- code = xfered;
- *offp += count - tuio.uio_resid;
- } else {
- /* Purge dirty chunks of file if there are too many dirty chunks.
- * Inside the write loop, we only do this at a chunk boundary.
- * Clean up partial chunk if necessary at end of loop.
- */
- if (AFS_CHUNKBASE(tuio.afsio_offset) !=
- AFS_CHUNKBASE(oldOffset)) {
- ObtainWriteLock(&vcp->lock, 402);
- code = afs_DoPartialWrite(vcp, &treq);
- vcp->states |= CDirty;
- ReleaseWriteLock(&vcp->lock);
- }
- code = xfered;
- *offp += count;
- toffs += count;
- ObtainWriteLock(&vcp->lock, 400);
- vcp->m.Date = osi_Time(); /* Set file date (for ranlib) */
- /* extend file */
- if (!(fp->f_flags & O_APPEND) && toffs > vcp->m.Length) {
- vcp->m.Length = toffs;
- }
- ReleaseWriteLock(&vcp->lock);
- }
- done:
- ;
- } else {
-#endif /* AFS_64BIT_CLIENT */
AFS_GUNLOCK();
code = generic_file_write(fp, buf, count, offp);
AFS_GLOCK();
-#ifdef AFS_64BIT_CLIENT
- }
-#endif /* AFS_64BIT_CLIENT */
}
ObtainWriteLock(&vcp->lock, 530);
afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
{
extern struct DirEntry *afs_dir_GetBlob();
- struct vcache *avc = ITOAFS(FILE_INODE(fp));
+ struct vcache *avc = VTOAFS(FILE_INODE(fp));
struct vrequest treq;
register struct dcache *tdc;
int code;
extern int afs_xioctl(struct inode *ip, struct file *fp, unsigned int com,
unsigned long arg);
+#if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
+static long afs_unlocked_xioctl(struct file *fp, unsigned int com,
+ unsigned long arg) {
+ return afs_xioctl(FILE_INODE(fp), fp, com, arg);
+
+}
+#endif
/* We need to detect unmap's after close. To do that, we need our own
* vm_operations_struct's. And we need to set them up for both the
static struct vm_operations_struct afs_shared_mmap_ops;
static int afs_shared_mmap_ops_inited = 0;
-void
+static void
afs_linux_vma_close(struct vm_area_struct *vmap)
{
struct vcache *vcp;
if (!vmap->vm_file)
return;
- vcp = ITOAFS(FILE_INODE(vmap->vm_file));
+ vcp = VTOAFS(FILE_INODE(vmap->vm_file));
if (!vcp)
return;
static int
afs_linux_mmap(struct file *fp, struct vm_area_struct *vmap)
{
- struct vcache *vcp = ITOAFS(FILE_INODE(fp));
+ struct vcache *vcp = VTOAFS(FILE_INODE(fp));
cred_t *credp = crref();
struct vrequest treq;
int code;
return code;
}
-int
+static int
afs_linux_open(struct inode *ip, struct file *fp)
{
- int code;
+ struct vcache *vcp = VTOAFS(ip);
cred_t *credp = crref();
+ int code;
#ifdef AFS_LINUX24_ENV
lock_kernel();
#endif
AFS_GLOCK();
- code = afs_open((struct vcache **)&ip, fp->f_flags, credp);
+ code = afs_open(&vcp, fp->f_flags, credp);
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
return -code;
}
-/* afs_Close is called from release, since release is used to handle all
- * file closings. In addition afs_linux_flush is called from sys_close to
- * handle flushing the data back to the server. The kicker is that we could
- * ignore flush completely if only sys_close took it's return value from
- * fput. See afs_linux_flush for notes on interactions between release and
- * flush.
- */
static int
afs_linux_release(struct inode *ip, struct file *fp)
{
- int code = 0;
+ struct vcache *vcp = VTOAFS(ip);
cred_t *credp = crref();
- struct vcache *vcp = ITOAFS(ip);
+ int code = 0;
#ifdef AFS_LINUX24_ENV
lock_kernel();
#endif
AFS_GLOCK();
- if (vcp->flushcnt) {
- vcp->flushcnt--; /* protected by AFS global lock. */
- } else {
- code = afs_close(vcp, fp->f_flags, credp);
- }
+ code = afs_close(vcp, fp->f_flags, credp);
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
return -code;
}
-#if defined(AFS_LINUX24_ENV)
static int
+#if defined(AFS_LINUX24_ENV)
afs_linux_fsync(struct file *fp, struct dentry *dp, int datasync)
#else
-static int
afs_linux_fsync(struct file *fp, struct dentry *dp)
#endif
{
lock_kernel();
#endif
AFS_GLOCK();
- code = afs_fsync(ITOAFS(ip), credp);
+ code = afs_fsync(VTOAFS(ip), credp);
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
{
int code = 0;
- struct vcache *vcp = ITOAFS(FILE_INODE(fp));
+ struct vcache *vcp = VTOAFS(FILE_INODE(fp));
cred_t *credp = crref();
struct AFS_FLOCK flock;
/* Convert to a lock format afs_lockctl understands. */
}
/* afs_linux_flush
- * flush is called from sys_close. We could ignore it, but sys_close return
- * code comes from flush, not release. We need to use release to keep
- * the vcache open count correct. Note that flush is called before release
- * (via fput) in sys_close. vcp->flushcnt is a bit of ugliness to avoid
- * races and also avoid calling afs_close twice when closing the file.
- * If we merely checked for opens > 0 in afs_linux_release, then if an
- * new open occurred when storing back the file, afs_linux_release would
- * incorrectly close the file and decrement the opens count. Calling afs_close
- * on the just flushed file is wasteful, since the background daemon will
- * execute the code that finally decides there is nothing to do.
+ * essentially the same as afs_fsync() but we need to get the return
+ * code for the sys_close() here, not afs_linux_release(), so call
+ * afs_StoreAllSegments() with AFS_LASTSTORE
*/
-int
+static int
afs_linux_flush(struct file *fp)
{
- struct vcache *vcp = ITOAFS(FILE_INODE(fp));
- int code = 0;
- cred_t *credp;
+ struct vrequest treq;
+ struct vcache *vcp = VTOAFS(FILE_INODE(fp));
+ cred_t *credp = crref();
+ int code;
- /* Only do this on the last close of the file pointer. */
-#if defined(AFS_LINUX24_ENV)
- if (atomic_read(&fp->f_count) > 1)
-#else
- if (fp->f_count > 1)
-#endif
- return 0;
+ AFS_GLOCK();
- credp = crref();
+ code = afs_InitReq(&treq, credp);
+ if (code)
+ goto out;
- AFS_GLOCK();
- code = afs_close(vcp, fp->f_flags, credp);
- vcp->flushcnt++; /* protected by AFS global lock. */
+ ObtainSharedLock(&vcp->lock, 535);
+ if (vcp->execsOrWriters > 0) {
+ UpgradeSToWLock(&vcp->lock, 536);
+ code = afs_StoreAllSegments(vcp, &treq, AFS_SYNC | AFS_LASTSTORE);
+ ConvertWToSLock(&vcp->lock);
+ }
+ code = afs_CheckCode(code, &treq, 54);
+ ReleaseSharedLock(&vcp->lock);
+
+out:
AFS_GUNLOCK();
crfree(credp);
.read = generic_read_dir,
#endif
.readdir = afs_linux_readdir,
+#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = afs_unlocked_xioctl,
+#else
.ioctl = afs_xioctl,
+#endif
+#ifdef HAVE_COMPAT_IOCTL
+ .compat_ioctl = afs_unlocked_xioctl,
+#endif
.open = afs_linux_open,
.release = afs_linux_release,
};
struct file_operations afs_file_fops = {
.read = afs_linux_read,
.write = afs_linux_write,
+#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = afs_unlocked_xioctl,
+#else
.ioctl = afs_xioctl,
+#endif
+#ifdef HAVE_COMPAT_IOCTL
+ .compat_ioctl = afs_unlocked_xioctl,
+#endif
.mmap = afs_linux_mmap,
.open = afs_linux_open,
.flush = afs_linux_flush,
* AFS Linux dentry operations
**********************************************************************/
+/* check_bad_parent() : Checks if this dentry's vcache is a root vcache
+ * that has its mvid (parent dir's fid) pointer set to the wrong directory
+ * due to being mounted in multiple points at once. If so, check_bad_parent()
+ * calls afs_lookup() to correct the vcache's mvid, as well as the volume's
+ * dotdotfid and mtpoint fid members.
+ * Parameters:
+ * dp - dentry to be checked.
+ * Return Values:
+ * None.
+ * Sideeffects:
+ * This dentry's vcache's mvid will be set to the correct parent directory's
+ * fid.
+ * This root vnode's volume will have its dotdotfid and mtpoint fids set
+ * to the correct parent and mountpoint fids.
+ */
+
+static inline void
+check_bad_parent(struct dentry *dp)
+{
+ cred_t *credp;
+ struct vcache *vcp = VTOAFS(dp->d_inode), *avc = NULL;
+ struct vcache *pvc = VTOAFS(dp->d_parent->d_inode);
+
+ if (vcp->mvid->Fid.Volume != pvc->fid.Fid.Volume) { /* bad parent */
+ credp = crref();
+
+ /* force a lookup, so vcp->mvid is fixed up */
+ afs_lookup(pvc, dp->d_name.name, &avc, credp);
+ if (!avc || vcp != avc) { /* bad, very bad.. */
+ afs_Trace4(afs_iclSetp, CM_TRACE_TMP_1S3L, ICL_TYPE_STRING,
+ "check_bad_parent: bad pointer returned from afs_lookup origvc newvc dentry",
+ ICL_TYPE_POINTER, vcp, ICL_TYPE_POINTER, avc,
+ ICL_TYPE_POINTER, dp);
+ }
+ if (avc)
+ AFS_RELE(AFSTOV(avc));
+ crfree(credp);
+ }
+
+ return;
+}
+
/* afs_linux_revalidate
* Ensure vcache is stat'd before use. Return 0 if entry is valid.
*/
static int
afs_linux_revalidate(struct dentry *dp)
{
- int code;
+ struct vattr vattr;
+ struct vcache *vcp = VTOAFS(dp->d_inode);
cred_t *credp;
- struct vrequest treq;
- struct vcache *vcp = ITOAFS(dp->d_inode);
- struct vcache *rootvp = NULL;
+ int code;
#ifdef AFS_LINUX24_ENV
lock_kernel();
#endif
AFS_GLOCK();
- if (afs_fakestat_enable && vcp->mvstat == 1 && vcp->mvid
- && (vcp->states & CMValid) && (vcp->states & CStatd)) {
- ObtainSharedLock(&afs_xvcache, 680);
- rootvp = afs_FindVCache(vcp->mvid, 0, 0);
- ReleaseSharedLock(&afs_xvcache);
- }
-
/* Make this a fast path (no crref), since it's called so often. */
if (vcp->states & CStatd) {
+
if (*dp->d_name.name != '/' && vcp->mvstat == 2) /* root vnode */
check_bad_parent(dp); /* check and correct mvid */
- if (rootvp)
- vcache2fakeinode(rootvp, vcp);
- else
- vcache2inode(vcp);
- if (rootvp)
- afs_PutVCache(rootvp);
+
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
}
credp = crref();
- code = afs_InitReq(&treq, credp);
+ code = afs_getattr(vcp, &vattr, credp);
if (!code)
- code = afs_VerifyVCache(vcp, &treq);
+ vattr2inode(AFSTOV(vcp), &vattr);
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
afs_linux_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
{
int err = afs_linux_revalidate(dentry);
- if (!err)
+ if (!err) {
generic_fillattr(dentry->d_inode, stat);
+}
return err;
}
#endif
* it is a directory. But since the kernel itself checks these possibilities
* later on, we shouldn't have to do it until later. Perhaps in the future..
*/
+static int
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
#ifdef DOP_REVALIDATE_TAKES_NAMEIDATA
-static int
afs_linux_dentry_revalidate(struct dentry *dp, struct nameidata *nd)
#else
-static int
afs_linux_dentry_revalidate(struct dentry *dp, int flags)
#endif
#else
-static int
afs_linux_dentry_revalidate(struct dentry *dp)
#endif
{
- char *name = NULL;
- cred_t *credp = crref();
- struct vrequest treq;
- struct vcache *lookupvcp = NULL;
- int code, bad_dentry = 1;
- struct sysname_info sysState;
- struct vcache *vcp, *parentvcp;
-
- sysState.allocked = 0;
+ struct vattr vattr;
+ cred_t *credp = NULL;
+ struct vcache *vcp, *pvcp, *tvc = NULL;
+ int valid;
#ifdef AFS_LINUX24_ENV
lock_kernel();
#endif
AFS_GLOCK();
- vcp = ITOAFS(dp->d_inode);
- parentvcp = ITOAFS(dp->d_parent->d_inode);
+ if (dp->d_inode) {
- /* If it's a negative dentry, then there's nothing to do. */
- if (!vcp || !parentvcp)
- goto done;
+ vcp = VTOAFS(dp->d_inode);
+ pvcp = VTOAFS(dp->d_parent->d_inode); /* dget_parent()? */
- /* If it is the AFS root, then there's no chance it needs
- * revalidating */
- if (vcp == afs_globalVp) {
- bad_dentry = 0;
- goto done;
- }
+ if (vcp == afs_globalVp)
+ goto good_dentry;
- if ((code = afs_InitReq(&treq, credp)))
- goto done;
-
- Check_AtSys(parentvcp, dp->d_name.name, &sysState, &treq);
- name = sysState.name;
-
- /* First try looking up the DNLC */
- if ((lookupvcp = osi_dnlc_lookup(parentvcp, name, WRITE_LOCK))) {
- /* Verify that the dentry does not point to an old inode */
- if (vcp != lookupvcp)
- goto done;
- /* Check and correct mvid */
- if (*name != '/' && vcp->mvstat == 2)
- check_bad_parent(dp);
- vcache2inode(vcp);
- bad_dentry = 0;
- goto done;
- }
+ if (*dp->d_name.name != '/' && vcp->mvstat == 2) /* root vnode */
+ check_bad_parent(dp); /* check and correct mvid */
+
+#ifdef notdef
+ /* If the last looker changes, we should make sure the current
+ * looker still has permission to examine this file. This would
+ * always require a crref() which would be "slow".
+ */
+ if (vcp->last_looker != treq.uid) {
+ if (!afs_AccessOK(vcp, (vType(vcp) == VREG) ? PRSFS_READ : PRSFS_LOOKUP, &treq, CHECK_MODE_BITS))
+ goto bad_dentry;
+
+ vcp->last_looker = treq.uid;
+ }
+#endif
+
+ /* If the parent's DataVersion has changed or the vnode
+ * is longer valid, we need to do a full lookup. VerifyVCache
+ * isn't enough since the vnode may have been renamed.
+ */
+
+ if (hgetlo(pvcp->m.DataVersion) > dp->d_time || !(vcp->states & CStatd)) {
+
+ credp = crref();
+ afs_lookup(pvcp, dp->d_name.name, &tvc, credp);
+ if (!tvc || tvc != vcp)
+ goto bad_dentry;
- /* A DNLC lookup failure cannot be trusted. Try a real lookup.
- Make sure to try the real name and not the @sys expansion;
- afs_lookup will expand @sys itself. */
-
- code = afs_lookup(parentvcp, dp->d_name.name, &lookupvcp, credp);
+ if (afs_getattr(vcp, &vattr, credp))
+ goto bad_dentry;
- /* Verify that the dentry does not point to an old inode */
- if (vcp != lookupvcp)
- goto done;
+ vattr2inode(AFSTOV(vcp), &vattr);
+ dp->d_time = hgetlo(pvcp->m.DataVersion);
+ }
+
+ /* should we always update the attributes at this point? */
+ /* unlikely--the vcache entry hasn't changed */
- bad_dentry = 0;
+ } else {
+#ifdef notyet
+ pvcp = VTOAFS(dp->d_parent->d_inode); /* dget_parent()? */
+ if (hgetlo(pvcp->m.DataVersion) > dp->d_time)
+ goto bad_dentry;
+#endif
+
+ /* No change in parent's DataVersion so this negative
+ * lookup is still valid. BUT, if a server is down a
+ * negative lookup can result so there should be a
+ * liftime as well. For now, always expire.
+ */
+
+ goto bad_dentry;
+ }
+
+ good_dentry:
+ valid = 1;
done:
/* Clean up */
- if (lookupvcp)
- afs_PutVCache(lookupvcp);
- if (sysState.allocked)
- osi_FreeLargeSpace(name);
-
+ if (tvc)
+ afs_PutVCache(tvc);
AFS_GUNLOCK();
+ if (credp)
+ crfree(credp);
- if (bad_dentry) {
+ if (!valid) {
shrink_dcache_parent(dp);
d_drop(dp);
}
-
#ifdef AFS_LINUX24_ENV
unlock_kernel();
#endif
- crfree(credp);
+ return valid;
- return !bad_dentry;
+ bad_dentry:
+ valid = 0;
+ goto done;
}
-#if !defined(AFS_LINUX26_ENV)
-/* afs_dentry_iput */
static void
afs_dentry_iput(struct dentry *dp, struct inode *ip)
{
- int isglock;
-
- if (ICL_SETACTIVE(afs_iclSetp)) {
- isglock = ISAFS_GLOCK();
- if (!isglock) AFS_GLOCK();
- afs_Trace3(afs_iclSetp, CM_TRACE_DENTRYIPUT, ICL_TYPE_POINTER, ip,
- ICL_TYPE_STRING, dp->d_parent->d_name.name,
- ICL_TYPE_STRING, dp->d_name.name);
- if (!isglock) AFS_GUNLOCK();
- }
+ struct vcache *vcp = VTOAFS(ip);
- osi_iput(ip);
+ AFS_GLOCK();
+ if (vcp->states & CUnlinked)
+ (void) afs_remunlink(vcp, 1); /* perhaps afs_InactiveVCache() instead */
+ AFS_GUNLOCK();
+
+ iput(ip);
}
-#endif
static int
afs_dentry_delete(struct dentry *dp)
{
- int isglock;
- if (ICL_SETACTIVE(afs_iclSetp)) {
- isglock = ISAFS_GLOCK();
- if (!isglock) AFS_GLOCK();
- afs_Trace3(afs_iclSetp, CM_TRACE_DENTRYDELETE, ICL_TYPE_POINTER,
- dp->d_inode, ICL_TYPE_STRING, dp->d_parent->d_name.name,
- ICL_TYPE_STRING, dp->d_name.name);
- if (!isglock) AFS_GUNLOCK();
- }
-
- if (dp->d_inode && (ITOAFS(dp->d_inode)->states & CUnlinked))
+ if (dp->d_inode && (VTOAFS(dp->d_inode)->states & CUnlinked))
return 1; /* bad inode? */
return 0;
struct dentry_operations afs_dentry_operations = {
.d_revalidate = afs_linux_dentry_revalidate,
.d_delete = afs_dentry_delete,
-#if !defined(AFS_LINUX26_ENV)
.d_iput = afs_dentry_iput,
-#endif
};
/**********************************************************************
*
* name is in kernel space at this point.
*/
+static int
#ifdef IOP_CREATE_TAKES_NAMEIDATA
-int
afs_linux_create(struct inode *dip, struct dentry *dp, int mode,
struct nameidata *nd)
#else
-int
afs_linux_create(struct inode *dip, struct dentry *dp, int mode)
#endif
{
- int code;
- cred_t *credp = crref();
struct vattr vattr;
+ cred_t *credp = crref();
const char *name = dp->d_name.name;
- struct inode *ip;
+ struct vcache *vcp;
+ int code;
VATTR_NULL(&vattr);
vattr.va_mode = mode;
+ vattr.va_type = mode & S_IFMT;
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
AFS_GLOCK();
- code =
- afs_create(ITOAFS(dip), (char *)name, &vattr, NONEXCL, mode,
- (struct vcache **)&ip, credp);
+ code = afs_create(VTOAFS(dip), (char *)name, &vattr, NONEXCL, mode,
+ &vcp, credp);
if (!code) {
- vattr2inode(ip, &vattr);
- /* Reset ops if symlink or directory. */
-#if defined(AFS_LINUX24_ENV)
- if (S_ISREG(ip->i_mode)) {
- ip->i_op = &afs_file_iops;
- ip->i_fop = &afs_file_fops;
- ip->i_data.a_ops = &afs_file_aops;
- } else if (S_ISDIR(ip->i_mode)) {
- ip->i_op = &afs_dir_iops;
- ip->i_fop = &afs_dir_fops;
- } else if (S_ISLNK(ip->i_mode)) {
- ip->i_op = &afs_symlink_iops;
- ip->i_data.a_ops = &afs_symlink_aops;
- ip->i_mapping = &ip->i_data;
- } else
- printk("afs_linux_create: FIXME\n");
-#else
- if (S_ISDIR(ip->i_mode))
- ip->i_op = &afs_dir_iops;
- else if (S_ISLNK(ip->i_mode))
- ip->i_op = &afs_symlink_iops;
-#endif
+ struct inode *ip = AFSTOV(vcp);
+ afs_getattr(vcp, &vattr, credp);
+ afs_fill_inode(ip, &vattr);
dp->d_op = &afs_dentry_operations;
+ dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
d_instantiate(dp, ip);
}
-
AFS_GUNLOCK();
+
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
#endif
/* afs_linux_lookup */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
+static struct dentry *
#ifdef IOP_LOOKUP_TAKES_NAMEIDATA
-struct dentry *
afs_linux_lookup(struct inode *dip, struct dentry *dp,
struct nameidata *nd)
#else
-struct dentry *
afs_linux_lookup(struct inode *dip, struct dentry *dp)
#endif
#else
-int
+static int
afs_linux_lookup(struct inode *dip, struct dentry *dp)
#endif
{
- int code = 0;
+ struct vattr vattr;
cred_t *credp = crref();
struct vcache *vcp = NULL;
const char *comp = dp->d_name.name;
+ struct dentry *res = NULL;
+ struct inode *ip = NULL;
+ int code;
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
AFS_GLOCK();
- code = afs_lookup(ITOAFS(dip), comp, &vcp, credp);
- AFS_GUNLOCK();
+ code = afs_lookup(VTOAFS(dip), comp, &vcp, credp);
if (vcp) {
- struct inode *ip = AFSTOI(vcp);
- /* Reset ops if symlink or directory. */
-#if defined(AFS_LINUX24_ENV)
- if (S_ISREG(ip->i_mode)) {
- ip->i_op = &afs_file_iops;
- ip->i_fop = &afs_file_fops;
- ip->i_data.a_ops = &afs_file_aops;
- } else if (S_ISDIR(ip->i_mode)) {
- ip->i_op = &afs_dir_iops;
- ip->i_fop = &afs_dir_fops;
- } else if (S_ISLNK(ip->i_mode)) {
- ip->i_op = &afs_symlink_iops;
- ip->i_data.a_ops = &afs_symlink_aops;
- ip->i_mapping = &ip->i_data;
- } else
- printk
- ("afs_linux_lookup: ip->i_mode 0x%x dp->d_name.name %s code %d\n",
- ip->i_mode, dp->d_name.name, code);
-#ifdef STRUCT_INODE_HAS_I_SECURITY
- if (ip->i_security == NULL) {
- if (security_inode_alloc(ip))
- panic("afs_linux_lookup: Cannot allocate inode security");
- }
-#endif
-#else
- if (S_ISDIR(ip->i_mode))
- ip->i_op = &afs_dir_iops;
- else if (S_ISLNK(ip->i_mode))
- ip->i_op = &afs_symlink_iops;
-#endif
+ ip = AFSTOV(vcp);
+
+ afs_getattr(vcp, &vattr, credp);
+ afs_fill_inode(ip, &vattr);
}
dp->d_op = &afs_dentry_operations;
- d_add(dp, AFSTOI(vcp));
+ dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
+ AFS_GUNLOCK();
+#if defined(AFS_LINUX24_ENV)
+ if (ip && S_ISDIR(ip->i_mode)) {
+ d_prune_aliases(ip);
+ res = d_find_alias(ip);
+ }
+ if (res) {
+ if (d_unhashed(res))
+ d_rehash(res);
+ } else
+#endif
+ d_add(dp, ip);
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
/* It's ok for the file to not be found. That's noted by the caller by
* seeing that the dp->d_inode field is NULL.
*/
+#if defined(AFS_LINUX24_ENV)
+ if (code == 0)
+ return res;
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
if (code == ENOENT)
return ERR_PTR(0);
#endif
}
-int
+static int
afs_linux_link(struct dentry *olddp, struct inode *dip, struct dentry *newdp)
{
int code;
d_drop(newdp);
AFS_GLOCK();
- code = afs_link(ITOAFS(oldip), ITOAFS(dip), name, credp);
+ code = afs_link(VTOAFS(oldip), VTOAFS(dip), name, credp);
AFS_GUNLOCK();
crfree(credp);
return -code;
}
-int
+static int
afs_linux_unlink(struct inode *dip, struct dentry *dp)
{
int code = EBUSY;
cred_t *credp = crref();
const char *name = dp->d_name.name;
- struct vcache *tvc = ITOAFS(dp->d_inode);
+ struct vcache *tvc = VTOAFS(dp->d_inode);
#if defined(AFS_LINUX26_ENV)
lock_kernel();
} while (__dp->d_inode != NULL);
AFS_GLOCK();
- code = afs_rename(ITOAFS(dip), dp->d_name.name, ITOAFS(dip), __dp->d_name.name, credp);
+ code = afs_rename(VTOAFS(dip), dp->d_name.name, VTOAFS(dip), __dp->d_name.name, credp);
if (!code) {
- tvc->mvid = __name;
+ tvc->mvid = (void *) __name;
crhold(credp);
if (tvc->uncred) {
crfree(tvc->uncred);
}
AFS_GUNLOCK();
- if (!code)
+ if (!code) {
+ __dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
d_move(dp, __dp);
+ }
dput(__dp);
goto out;
}
AFS_GLOCK();
- code = afs_remove(ITOAFS(dip), name, credp);
+ code = afs_remove(VTOAFS(dip), name, credp);
AFS_GUNLOCK();
if (!code)
d_drop(dp);
}
-int
+static int
afs_linux_symlink(struct inode *dip, struct dentry *dp, const char *target)
{
int code;
*/
d_drop(dp);
- AFS_GLOCK();
VATTR_NULL(&vattr);
- code = afs_symlink(ITOAFS(dip), name, &vattr, target, credp);
+ AFS_GLOCK();
+ code = afs_symlink(VTOAFS(dip), name, &vattr, target, credp);
AFS_GUNLOCK();
crfree(credp);
return -code;
}
-int
+static int
afs_linux_mkdir(struct inode *dip, struct dentry *dp, int mode)
{
int code;
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
- AFS_GLOCK();
VATTR_NULL(&vattr);
vattr.va_mask = ATTR_MODE;
vattr.va_mode = mode;
- code = afs_mkdir(ITOAFS(dip), name, &vattr, &tvcp, credp);
- AFS_GUNLOCK();
+ AFS_GLOCK();
+ code = afs_mkdir(VTOAFS(dip), name, &vattr, &tvcp, credp);
if (tvcp) {
- tvcp->v.v_op = &afs_dir_iops;
-#if defined(AFS_LINUX24_ENV)
- tvcp->v.v_fop = &afs_dir_fops;
-#endif
+ struct inode *ip = AFSTOV(tvcp);
+
+ afs_getattr(tvcp, &vattr, credp);
+ afs_fill_inode(ip, &vattr);
+
dp->d_op = &afs_dentry_operations;
- d_instantiate(dp, AFSTOI(tvcp));
+ dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
+ d_instantiate(dp, ip);
}
+ AFS_GUNLOCK();
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
return -code;
}
-int
+static int
afs_linux_rmdir(struct inode *dip, struct dentry *dp)
{
int code;
lock_kernel();
#endif
AFS_GLOCK();
- code = afs_rmdir(ITOAFS(dip), name, credp);
+ code = afs_rmdir(VTOAFS(dip), name, credp);
AFS_GUNLOCK();
/* Linux likes to see ENOTEMPTY returned from an rmdir() syscall
}
-
-int
+static int
afs_linux_rename(struct inode *oldip, struct dentry *olddp,
struct inode *newip, struct dentry *newdp)
{
#endif
AFS_GLOCK();
- code = afs_rename(ITOAFS(oldip), oldname, ITOAFS(newip), newname, credp);
+ code = afs_rename(VTOAFS(oldip), oldname, VTOAFS(newip), newname, credp);
AFS_GUNLOCK();
if (rehash)
struct iovec iov;
setup_uio(&tuio, &iov, target, (afs_offs_t) 0, maxlen, UIO_READ, seg);
- code = afs_readlink(ITOAFS(ip), &tuio, credp);
+ code = afs_readlink(VTOAFS(ip), &tuio, credp);
crfree(credp);
if (!code)
/* afs_linux_readlink
* Fill target (which is in user space) with contents of symlink.
*/
-int
+static int
afs_linux_readlink(struct dentry *dp, char *target, int maxlen)
{
int code;
/* afs_linux_follow_link
* a file system dependent link following routine.
*/
-struct dentry *
+static struct dentry *
afs_linux_follow_link(struct dentry *dp, struct dentry *basep,
unsigned int follow)
{
/* afs_linux_readpage
* all reads come through here. A strategy-like read call.
*/
-int
+static int
afs_linux_readpage(struct file *fp, struct page *pp)
{
int code;
struct iovec iovec;
struct inode *ip = FILE_INODE(fp);
int cnt = page_count(pp);
- struct vcache *avc = ITOAFS(ip);
+ struct vcache *avc = VTOAFS(ip);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
return -code;
}
-#if defined(AFS_LINUX24_ENV)
-#ifdef AOP_WRITEPAGE_TAKES_WRITEBACK_CONTROL
-int
-afs_linux_writepage(struct page *pp, struct writeback_control *wbc)
-#else
-int
-afs_linux_writepage(struct page *pp)
-#endif
-{
- struct address_space *mapping = pp->mapping;
- struct inode *inode;
- unsigned long end_index;
- unsigned offset = PAGE_CACHE_SIZE;
- long status;
-
-#if defined(AFS_LINUX26_ENV)
- if (PageReclaim(pp)) {
- return WRITEPAGE_ACTIVATE;
- }
-#else
- if (PageLaunder(pp)) {
- return(fail_writepage(pp));
- }
-#endif
-
- inode = (struct inode *)mapping->host;
- end_index = inode->i_size >> PAGE_CACHE_SHIFT;
-
- /* easy case */
- if (pp->index < end_index)
- goto do_it;
- /* things got complicated... */
- offset = inode->i_size & (PAGE_CACHE_SIZE - 1);
- /* OK, are we completely out? */
- if (pp->index >= end_index + 1 || !offset)
- return -EIO;
- do_it:
- AFS_GLOCK();
- status = afs_linux_writepage_sync(inode, pp, 0, offset);
- AFS_GUNLOCK();
- SetPageUptodate(pp);
- UnlockPage(pp);
- if (status == offset)
- return 0;
- else
- return status;
-}
-#endif
-
-/* afs_linux_permission
- * Check access rights - returns error if can't check or permission denied.
- */
-#ifdef IOP_PERMISSION_TAKES_NAMEIDATA
-int
-afs_linux_permission(struct inode *ip, int mode, struct nameidata *nd)
-#else
-int
-afs_linux_permission(struct inode *ip, int mode)
-#endif
-{
- int code;
- cred_t *credp = crref();
- int tmp = 0;
-
- AFS_GLOCK();
- if (mode & MAY_EXEC)
- tmp |= VEXEC;
- if (mode & MAY_READ)
- tmp |= VREAD;
- if (mode & MAY_WRITE)
- tmp |= VWRITE;
- code = afs_access(ITOAFS(ip), tmp, credp);
-
- AFS_GUNLOCK();
- crfree(credp);
- return -code;
-}
-
#if defined(AFS_LINUX24_ENV)
-int
+static int
afs_linux_writepage_sync(struct inode *ip, struct page *pp,
unsigned long offset, unsigned int count)
{
- struct vcache *vcp = ITOAFS(ip);
+ struct vcache *vcp = VTOAFS(ip);
char *buffer;
afs_offs_t base;
int code = 0;
base = (pp->index << PAGE_CACHE_SHIFT) + offset;
credp = crref();
+ lock_kernel();
+ AFS_GLOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
ICL_TYPE_INT32, 99999);
code = afs_write(vcp, &tuio, f_flags, credp, 0);
- vcache2inode(vcp);
+ ip->i_size = vcp->m.Length;
+ ip->i_blocks = ((vcp->m.Length + 1023) >> 10) << 1;
if (!code
&& afs_stats_cmperf.cacheCurrDirtyChunks >
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
ICL_TYPE_INT32, code);
+ AFS_GUNLOCK();
+ unlock_kernel();
crfree(credp);
kunmap(pp);
return code;
}
+
static int
-afs_linux_updatepage(struct file *file, struct page *page,
- unsigned long offset, unsigned int count)
+#ifdef AOP_WRITEPAGE_TAKES_WRITEBACK_CONTROL
+afs_linux_writepage(struct page *pp, struct writeback_control *wbc)
+#else
+afs_linux_writepage(struct page *pp)
+#endif
{
- struct dentry *dentry = file->f_dentry;
+ struct address_space *mapping = pp->mapping;
+ struct inode *inode;
+ unsigned long end_index;
+ unsigned offset = PAGE_CACHE_SIZE;
+ long status;
+
+#if defined(AFS_LINUX26_ENV)
+ if (PageReclaim(pp)) {
+ return WRITEPAGE_ACTIVATE;
+ }
+#else
+ if (PageLaunder(pp)) {
+ return(fail_writepage(pp));
+ }
+#endif
- return afs_linux_writepage_sync(dentry->d_inode, page, offset, count);
+ inode = (struct inode *)mapping->host;
+ end_index = inode->i_size >> PAGE_CACHE_SHIFT;
+
+ /* easy case */
+ if (pp->index < end_index)
+ goto do_it;
+ /* things got complicated... */
+ offset = inode->i_size & (PAGE_CACHE_SIZE - 1);
+ /* OK, are we completely out? */
+ if (pp->index >= end_index + 1 || !offset)
+ return -EIO;
+ do_it:
+ status = afs_linux_writepage_sync(inode, pp, 0, offset);
+ SetPageUptodate(pp);
+ UnlockPage(pp);
+ if (status == offset)
+ return 0;
+ else
+ return status;
}
#else
/* afs_linux_updatepage
* Called from generic_file_write. buffer is still in user space. pagep
* has been filled in with old data if we're updating less than a page.
*/
-int
+static int
afs_linux_updatepage(struct file *fp, struct page *pp, unsigned long offset,
unsigned int count, int sync)
{
- struct vcache *vcp = ITOAFS(FILE_INODE(fp));
+ struct vcache *vcp = VTOAFS(FILE_INODE(fp));
u8 *page_addr = (u8 *) afs_linux_page_address(pp);
int code = 0;
cred_t *credp;
code = afs_write(vcp, &tuio, fp->f_flags, credp, 0);
- vcache2inode(vcp);
+ ip->i_size = vcp->m.Length;
+ ip->i_blocks = ((vcp->m.Length + 1023) >> 10) << 1;
code = code ? -code : count - tuio.uio_resid;
afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
}
#endif
+/* afs_linux_permission
+ * Check access rights - returns error if can't check or permission denied.
+ */
+static int
+#ifdef IOP_PERMISSION_TAKES_NAMEIDATA
+afs_linux_permission(struct inode *ip, int mode, struct nameidata *nd)
+#else
+afs_linux_permission(struct inode *ip, int mode)
+#endif
+{
+ int code;
+ cred_t *credp = crref();
+ int tmp = 0;
+
+ AFS_GLOCK();
+ if (mode & MAY_EXEC)
+ tmp |= VEXEC;
+ if (mode & MAY_READ)
+ tmp |= VREAD;
+ if (mode & MAY_WRITE)
+ tmp |= VWRITE;
+ code = afs_access(VTOAFS(ip), tmp, credp);
+
+ AFS_GUNLOCK();
+ crfree(credp);
+ return -code;
+}
+
#if defined(AFS_LINUX24_ENV)
static int
afs_linux_commit_write(struct file *file, struct page *page, unsigned offset,
{
int code;
- lock_kernel();
- AFS_GLOCK();
- code = afs_linux_updatepage(file, page, offset, to - offset);
- AFS_GUNLOCK();
- unlock_kernel();
+ code = afs_linux_writepage_sync(file->f_dentry->d_inode, page,
+ offset, to - offset);
+#if !defined(AFS_LINUX26_ENV)
kunmap(page);
+#endif
return code;
}
afs_linux_prepare_write(struct file *file, struct page *page, unsigned from,
unsigned to)
{
+/* sometime between 2.4.0 and 2.4.19, the callers of prepare_write began to
+ call kmap directly instead of relying on us to do it */
+#if !defined(AFS_LINUX26_ENV)
kmap(page);
+#endif
return 0;
}
extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp);
#endif
-struct inode_operations afs_file_iops = {
+static struct inode_operations afs_file_iops = {
#if defined(AFS_LINUX26_ENV)
.permission = afs_linux_permission,
.getattr = afs_linux_getattr,
};
#if defined(AFS_LINUX24_ENV)
-struct address_space_operations afs_file_aops = {
+static struct address_space_operations afs_file_aops = {
.readpage = afs_linux_readpage,
.writepage = afs_linux_writepage,
.commit_write = afs_linux_commit_write,
* by what sort of operation is allowed.....
*/
-struct inode_operations afs_dir_iops = {
+static struct inode_operations afs_dir_iops = {
#if !defined(AFS_LINUX24_ENV)
.default_file_ops = &afs_dir_fops,
#else
return code;
}
-struct address_space_operations afs_symlink_aops = {
+static struct address_space_operations afs_symlink_aops = {
.readpage = afs_symlink_filler
};
#endif
-struct inode_operations afs_symlink_iops = {
+static struct inode_operations afs_symlink_iops = {
#if defined(AFS_LINUX24_ENV)
.readlink = page_readlink,
#if defined(HAVE_KERNEL_PAGE_FOLLOW_LINK)
.follow_link = page_follow_link,
#else
.follow_link = page_follow_link_light,
+ .put_link = page_put_link,
#endif
.setattr = afs_notify_change,
#else
.revalidate = afs_linux_revalidate,
#endif
};
+
+void
+afs_fill_inode(struct inode *ip, struct vattr *vattr)
+{
+
+ if (vattr)
+ vattr2inode(ip, vattr);
+
+/* Reset ops if symlink or directory. */
+ if (S_ISREG(ip->i_mode)) {
+ ip->i_op = &afs_file_iops;
+#if defined(AFS_LINUX24_ENV)
+ ip->i_fop = &afs_file_fops;
+ ip->i_data.a_ops = &afs_file_aops;
+#endif
+
+ } else if (S_ISDIR(ip->i_mode)) {
+ ip->i_op = &afs_dir_iops;
+#if defined(AFS_LINUX24_ENV)
+ ip->i_fop = &afs_dir_fops;
+#endif
+
+ } else if (S_ISLNK(ip->i_mode)) {
+ ip->i_op = &afs_symlink_iops;
+#if defined(AFS_LINUX24_ENV)
+ ip->i_data.a_ops = &afs_symlink_aops;
+ ip->i_mapping = &ip->i_data;
+#endif
+ }
+
+ /* insert_inode_hash(ip); -- this would make iget() work (if we used it) */
+}
git://git.openafs.org / openafs.git / blobdiff