* stat calls.
*/
-#include "../afs/param.h"
-#include "../afs/sysincludes.h"
-#include "../afs/afsincludes.h"
-#include "../afs/afs_stats.h"
-#include "../h/mm.h"
-#include "../h/pagemap.h"
+#include <afsconfig.h>
+#include "afs/param.h"
+
+RCSID("$Header$");
+
+#include "afs/sysincludes.h"
+#include "afsincludes.h"
+#include "afs/afs_stats.h"
+#include "afs/afs_osidnlc.h"
+#include "h/mm.h"
+#include "h/pagemap.h"
#if defined(AFS_LINUX24_ENV)
-#include "../h/smp_lock.h"
+#include "h/smp_lock.h"
+#endif
+
+#ifdef pgoff2loff
+#define pageoff(pp) pgoff2loff((pp)->index)
+#else
+#define pageoff(pp) pp->offset
#endif
extern struct vcache *afs_globalVp;
+extern afs_rwlock_t afs_xvcache;
extern struct dentry_operations *afs_dops;
#if defined(AFS_LINUX24_ENV)
loff_t *offp)
{
ssize_t code;
- struct vcache *vcp = (struct vcache*)fp->f_dentry->d_inode;
+ struct vcache *vcp = ITOAFS(fp->f_dentry->d_inode);
cred_t *credp = crref();
struct vrequest treq;
AFS_GLOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_READOP, ICL_TYPE_POINTER, vcp,
- ICL_TYPE_INT32, (int)*offp,
+ ICL_TYPE_OFFSET, offp,
ICL_TYPE_INT32, count,
ICL_TYPE_INT32, 99999);
if (code)
code = -code;
else {
- 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
+ if (*offp + count > afs_vmMappingEnd) {
+ uio_t tuio;
+ struct iovec iov;
+ afs_size_t oldOffset = *offp;
+ 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,
- ICL_TYPE_INT32, (int)*offp,
+ ICL_TYPE_OFFSET, offp,
ICL_TYPE_INT32, count,
ICL_TYPE_INT32, code);
{
ssize_t code = 0;
int code2;
- struct vcache *vcp = (struct vcache *)fp->f_dentry->d_inode;
+ struct vcache *vcp = ITOAFS(fp->f_dentry->d_inode);
struct vrequest treq;
cred_t *credp = crref();
AFS_GLOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_WRITEOP, ICL_TYPE_POINTER, vcp,
- ICL_TYPE_INT32, (int)*offp, ICL_TYPE_INT32, count,
- ICL_TYPE_INT32, (fp->f_flags & O_APPEND) ? 99998 : 99999);
+ ICL_TYPE_OFFSET, offp,
+ ICL_TYPE_INT32, count,
+ ICL_TYPE_INT32, (fp->f_flags & O_APPEND) ? 99998 : 99999);
/* get a validated vcache entry */
ObtainWriteLock(&vcp->lock, 529);
afs_FakeOpen(vcp);
ReleaseWriteLock(&vcp->lock);
- AFS_GUNLOCK();
if (code)
code = -code;
else {
- code = generic_file_write(fp, buf, count, offp);
+#ifdef AFS_64BIT_CLIENT
+ if (*offp + count > afs_vmMappingEnd) {
+ uio_t tuio;
+ struct iovec iov;
+ afs_size_t oldOffset = *offp;
+ 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;
+ AFS_GUNLOCK();
+ code = generic_file_write(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_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;
+ ObtainWriteLock(&vcp->lock,400);
+ vcp->m.Date = osi_Time(); /* Set file date (for ranlib) */
+ /* extend file */
+ if (*offp > vcp->m.Length) {
+ vcp->m.Length = *offp;
+ }
+ 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 */
}
- AFS_GLOCK();
ObtainWriteLock(&vcp->lock, 530);
vcp->m.Date = osi_Time(); /* set modification time */
afs_FakeClose(vcp, credp);
if (code>=0)
- code2 = afs_DoPartialWrite(vcp, &treq);
+ code2 = afs_DoPartialWrite(vcp, &treq);
if (code2 && code >=0)
- code = (ssize_t) -code2;
+ code = (ssize_t) -code2;
ReleaseWriteLock(&vcp->lock);
afs_Trace4(afs_iclSetp, CM_TRACE_WRITEOP, ICL_TYPE_POINTER, vcp,
- ICL_TYPE_INT32, (int)*offp, ICL_TYPE_INT32, count,
- ICL_TYPE_INT32, code);
+ ICL_TYPE_OFFSET, offp,
+ ICL_TYPE_INT32, count,
+ ICL_TYPE_INT32, code);
AFS_GUNLOCK();
crfree(credp);
static int afs_linux_readdir(struct file *fp,
void *dirbuf, filldir_t filldir)
{
- struct vcache *avc = (struct vcache*)FILE_INODE(fp);
+ extern struct DirEntry * afs_dir_GetBlob();
+ struct vcache *avc = ITOAFS(FILE_INODE(fp));
struct vrequest treq;
register struct dcache *tdc;
int code;
struct DirEntry *de;
ino_t ino;
int len;
- int origOffset;
+ afs_size_t origOffset, tlen;
cred_t *credp = crref();
+ struct afs_fakestat_state fakestat;
AFS_GLOCK();
AFS_STATCNT(afs_readdir);
return -code;
}
+ afs_InitFakeStat(&fakestat);
+ code = afs_EvalFakeStat(&avc, &fakestat, &treq);
+ if (code) {
+ afs_PutFakeStat(&fakestat);
+ AFS_GUNLOCK();
+ return -code;
+ }
+
/* update the cache entry */
tagain:
code = afs_VerifyVCache(avc, &treq);
if (code) {
+ afs_PutFakeStat(&fakestat);
AFS_GUNLOCK();
return -code;
}
/* get a reference to the entire directory */
- tdc = afs_GetDCache(avc, 0, &treq, &origOffset, &len, 1);
+ tdc = afs_GetDCache(avc, (afs_size_t) 0, &treq, &origOffset, &tlen, 1);
+ len = tlen;
if (!tdc) {
+ afs_PutFakeStat(&fakestat);
AFS_GUNLOCK();
return -ENOENT;
}
ObtainReadLock(&avc->lock);
+ ObtainReadLock(&tdc->lock);
/*
* Make sure that the data in the cache is current. There are two
* cases we need to worry about:
* 2. The cache data is no longer valid
*/
while ((avc->states & CStatd)
- && (tdc->flags & DFFetching)
+ && (tdc->dflags & DFFetching)
&& hsame(avc->m.DataVersion, tdc->f.versionNo)) {
- tdc->flags |= DFWaiting;
+ ReleaseReadLock(&tdc->lock);
ReleaseReadLock(&avc->lock);
afs_osi_Sleep(&tdc->validPos);
ObtainReadLock(&avc->lock);
+ ObtainReadLock(&tdc->lock);
}
if (!(avc->states & CStatd)
|| !hsame(avc->m.DataVersion, tdc->f.versionNo)) {
+ ReleaseReadLock(&tdc->lock);
ReleaseReadLock(&avc->lock);
afs_PutDCache(tdc);
goto tagain;
if (!dirpos)
break;
- de = (struct DirEntry*)afs_dir_GetBlob(&tdc->f.inode, dirpos);
+ de = afs_dir_GetBlob(&tdc->f.inode, dirpos);
if (!de)
break;
len = strlen(de->name);
/* filldir returns -EINVAL when the buffer is full. */
- /* code = (*filldir)(dirbuf, de->name, len, offset, ino); */
- code = (*filldir)(dirbuf, de->name, len, offset, ino, DT_DIR);
+#if (defined(AFS_LINUX24_ENV) || defined(pgoff2loff)) && defined(DECLARE_FSTYPE)
+ {
+ unsigned int type=DT_UNKNOWN;
+ struct VenusFid afid;
+ struct vcache *tvc;
+ int vtype;
+ afid.Cell=avc->fid.Cell;
+ afid.Fid.Volume=avc->fid.Fid.Volume;
+ afid.Fid.Vnode=ntohl(de->fid.vnode);
+ afid.Fid.Unique=ntohl(de->fid.vunique);
+ if ((avc->states & CForeign) == 0 &&
+ (ntohl(de->fid.vnode) & 1)) {
+ type=DT_DIR;
+ } else if ((tvc=afs_FindVCache(&afid,0,0))) {
+ if (tvc->mvstat) {
+ type=DT_DIR;
+ } else if (((tvc->states) & (CStatd|CTruth))) {
+ /* CTruth will be set if the object has
+ *ever* been statd */
+ vtype=vType(tvc);
+ if (vtype == VDIR)
+ type=DT_DIR;
+ else if (vtype == VREG)
+ type=DT_REG;
+ /* Don't do this until we're sure it can't be a mtpt */
+ /* else if (vtype == VLNK)
+ type=DT_LNK; */
+ /* what other types does AFS support? */
+ }
+ /* clean up from afs_FindVCache */
+ afs_PutVCache(tvc);
+ }
+ code = (*filldir)(dirbuf, de->name, len, offset, ino, type);
+ }
+#else
+ code = (*filldir)(dirbuf, de->name, len, offset, ino);
+#endif
DRelease(de, 0);
if (code)
break;
*/
fp->f_pos = (loff_t)offset;
+ ReleaseReadLock(&tdc->lock);
afs_PutDCache(tdc);
ReleaseReadLock(&avc->lock);
+ afs_PutFakeStat(&fakestat);
AFS_GUNLOCK();
return 0;
}
if (!vmap->vm_file)
return;
- vcp = (struct vcache*)FILE_INODE(vmap->vm_file);
+ vcp = ITOAFS(FILE_INODE(vmap->vm_file));
if (!vcp)
return;
static int afs_linux_mmap(struct file *fp, struct vm_area_struct *vmap)
{
- struct vcache *vcp = (struct vcache*)FILE_INODE(fp);
+ struct vcache *vcp = ITOAFS(FILE_INODE(fp));
cred_t *credp = crref();
struct vrequest treq;
int code;
AFS_GLOCK();
#if defined(AFS_LINUX24_ENV)
afs_Trace3(afs_iclSetp, CM_TRACE_GMAP, ICL_TYPE_POINTER, vcp,
- ICL_TYPE_POINTER, vmap->vm_start,
- ICL_TYPE_INT32, vmap->vm_end - vmap->vm_start);
+ ICL_TYPE_POINTER, vmap->vm_start,
+ ICL_TYPE_INT32, vmap->vm_end - vmap->vm_start);
#else
afs_Trace4(afs_iclSetp, CM_TRACE_GMAP, ICL_TYPE_POINTER, vcp,
ICL_TYPE_POINTER, vmap->vm_start,
}
vmap->vm_ops = &afs_private_mmap_ops;
}
-
-
+
+
/* Add an open reference on the first mapping. */
if (vcp->mapcnt == 0) {
vcp->execsOrWriters++;
{
int code = 0;
cred_t *credp = crref();
- struct vcache *vcp = (struct vcache*)ip;
+ struct vcache *vcp = ITOAFS(ip);
AFS_GLOCK();
#ifdef AFS_LINUX24_ENV
#ifdef AFS_LINUX24_ENV
lock_kernel();
#endif
- code = afs_fsync((struct vcache*)ip, credp);
+ code = afs_fsync(ITOAFS(ip), credp);
#ifdef AFS_LINUX24_ENV
unlock_kernel();
#endif
static int afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
{
int code = 0;
- struct vcache *vcp = (struct vcache*)FILE_INODE(fp);
+ struct vcache *vcp = ITOAFS(FILE_INODE(fp));
cred_t *credp = crref();
+#ifdef AFS_LINUX24_ENV
+ struct flock64 flock;
+#else
struct flock flock;
+#endif
/* Convert to a lock format afs_lockctl understands. */
memset((char*)&flock, 0, sizeof(flock));
flock.l_start = flp->fl_start;
flock.l_len = flp->fl_end - flp->fl_start;
+ /* Safe because there are no large files, yet */
+#if F_GETLK != F_GETLK64
+ if (cmd = F_GETLK64)
+ cmd = F_GETLK;
+ else if (cmd = F_SETLK64)
+ cmd = F_SETLK;
+ else if (cmd = F_SETLKW64)
+ cmd = F_SETLKW;
+#endif /* F_GETLK != F_GETLK64 */
+
AFS_GLOCK();
code = afs_lockctl(vcp, &flock, cmd, credp);
AFS_GUNLOCK();
+
+ /* Convert flock back to Linux's file_lock */
+ flp->fl_type = flock.l_type;
+ flp->fl_pid = flock.l_pid;
+ flp->fl_start = flock.l_start;
+ flp->fl_end = flock.l_start + flock.l_len;
+
crfree(credp);
return -code;
*/
int afs_linux_flush(struct file *fp)
{
- struct vcache *vcp = (struct vcache *)FILE_INODE(fp);
+ struct vcache *vcp = ITOAFS(FILE_INODE(fp));
int code = 0;
cred_t *credp;
}
/* Not allowed to directly read a directory. */
-int afs_linux_dir_read(struct file *fp, char *buf, size_t count, loff_t *ppos)
+ssize_t afs_linux_dir_read(struct file *fp, char *buf, size_t count, loff_t *ppos)
{
return -EISDIR;
}
int code;
cred_t *credp;
struct vrequest treq;
- struct vcache *vcp = (struct vcache*)dp->d_inode;
+ struct vcache *vcp = ITOAFS(dp->d_inode);
+ struct vcache *rootvp = NULL;
AFS_GLOCK();
-#ifdef AFS_LINUX24_ENV
- lock_kernel();
-#endif
- /* If it's a negative dentry, then there's nothing to do. */
- if (!vcp) {
+ 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);
+ }
+
#ifdef AFS_LINUX24_ENV
- unlock_kernel();
+ lock_kernel();
#endif
- AFS_GUNLOCK();
- return 0;
- }
/* 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 */
+ if (*dp->d_name.name != '/' && vcp->mvstat == 2) /* root vnode */
check_bad_parent(dp); /* check and correct mvid */
- vcache2inode(vcp);
+ if (rootvp)
+ vcache2fakeinode(rootvp, vcp);
+ else
+ vcache2inode(vcp);
#ifdef AFS_LINUX24_ENV
unlock_kernel();
#endif
+ if (rootvp) afs_PutVCache(rootvp);
AFS_GUNLOCK();
return 0;
}
return -code ;
}
-/* Validate a dentry. Return 0 if unchanged, 1 if VFS layer should re-evaluate.
+
+/* Validate a dentry. Return 1 if unchanged, 0 if VFS layer should re-evaluate.
* In kernels 2.2.10 and above, we are passed an additional flags var which
* may have either the LOOKUP_FOLLOW OR LOOKUP_DIRECTORY set in which case
* we are advised to follow the entry if it is a link or to make sure that
static int afs_linux_dentry_revalidate(struct dentry *dp)
#endif
{
- int code;
- cred_t *credp;
+ char *name;
+ cred_t *credp = crref();
struct vrequest treq;
- struct vcache *vcp = (struct vcache*)dp->d_inode;
+ struct vcache *lookupvcp = NULL;
+ int code, bad_dentry = 1;
+ struct sysname_info sysState;
+ struct vcache *vcp = ITOAFS(dp->d_inode);
+ struct vcache *parentvcp = ITOAFS(dp->d_parent->d_inode);
AFS_GLOCK();
-#ifdef AFS_LINUX24_ENV
lock_kernel();
-#endif
+
+ sysState.allocked = 0;
/* If it's a negative dentry, then there's nothing to do. */
- if (!vcp) {
-#ifdef AFS_LINUX24_ENV
- unlock_kernel();
-#endif
- AFS_GUNLOCK();
- return 0;
+ if (!vcp || !parentvcp)
+ goto done;
+
+ /* If it is the AFS root, then there's no chance it needs
+ revalidating */
+ if (vcp == afs_globalVp) {
+ bad_dentry = 0;
+ goto done;
}
- /* 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 ((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);
-#ifdef AFS_LINUX24_ENV
- unlock_kernel();
-#endif
- AFS_GUNLOCK();
- return 0;
+ bad_dentry = 0;
+ goto done;
}
- credp = crref();
- code = afs_InitReq(&treq, credp);
- if (!code)
- code = afs_VerifyVCache(vcp, &treq);
+ /* A DNLC lookup failure cannot be trusted. Try a real lookup */
+ code = afs_lookup(parentvcp, name, &lookupvcp, credp);
+
+ /* Verify that the dentry does not point to an old inode */
+ if (vcp != lookupvcp)
+ goto done;
+
+ bad_dentry = 0;
+
+done:
+ /* Clean up */
+ if (lookupvcp)
+ afs_PutVCache(lookupvcp);
+ if (sysState.allocked)
+ osi_FreeLargeSpace(name);
-#ifdef AFS_LINUX24_ENV
- unlock_kernel();
-#endif
AFS_GUNLOCK();
crfree(credp);
+ if (bad_dentry) {
+ shrink_dcache_parent(dp);
+ d_drop(dp);
+ }
+ unlock_kernel();
+
+ return !bad_dentry;
+}
+
+#ifdef notdef
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
+static int afs_linux_dentry_revalidate(struct dentry *dp, int flags)
+#else
+static int afs_linux_dentry_revalidate(struct dentry *dp)
+#endif
+{
+ int code;
+ cred_t *credp;
+ struct vrequest treq;
+ struct inode *ip = AFSTOI(dp->d_inode);
+
+ unsigned long timeout = 3*HZ; /* 3 seconds */
+
+ if (!ip)
+ printk("negative dentry: %s\n", dp->d_name.name);
+
+ if (!(flags & LOOKUP_CONTINUE)) {
+ long diff = CURRENT_TIME - dp->d_parent->d_inode->i_mtime;
+
+ if (diff < 15*60)
+ timeout = 0;
+ }
+
+ if (time_after(jiffies, dp->d_time + timeout))
+ goto out_bad;
+
+ out_valid:
return 1;
+
+ out_bad:
+ return 0;
}
+#endif
/* afs_dentry_iput */
static void afs_dentry_iput(struct dentry *dp, struct inode *ip)
{
-#if defined(AFS_LINUX24_ENV)
- if (atomic_read(&ip->i_count) == 0 || atomic_read(&ip->i_count) & 0xffff0000) {
-#else
- if (ip->i_count == 0 || ip->i_count & 0xffff0000) {
-#endif
- osi_Panic("Bad refCount %d on inode 0x%x\n",
-#if defined(AFS_LINUX24_ENV)
- atomic_read(&ip->i_count), ip);
-#else
- ip->i_count, ip);
-#endif
+ if (ICL_SETACTIVE(afs_iclSetp)) {
+ 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);
+ AFS_GUNLOCK();
}
-#if defined(AFS_LINUX24_ENV)
- atomic_dec(&ip->i_count);
- if (!atomic_read(&ip->i_count)) {
-#else
- ip->i_count --;
- if (!ip->i_count) {
-#endif
- afs_delete_inode(ip);
+
+ osi_iput(ip);
+}
+
+static int afs_dentry_delete(struct dentry *dp)
+{
+ if (ICL_SETACTIVE(afs_iclSetp)) {
+ 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);
+ AFS_GUNLOCK();
}
+
+ if (dp->d_inode && (ITOAFS(dp->d_inode)->states & CUnlinked))
+ return 1; /* bad inode? */
+
+ return 0;
}
#if defined(AFS_LINUX24_ENV)
struct dentry_operations afs_dentry_operations = {
d_revalidate: afs_linux_dentry_revalidate,
d_iput: afs_dentry_iput,
+ d_delete: afs_dentry_delete,
};
struct dentry_operations *afs_dops = &afs_dentry_operations;
#else
afs_linux_dentry_revalidate, /* d_validate(struct dentry *) */
NULL, /* d_hash */
NULL, /* d_compare */
- NULL, /* d_delete(struct dentry *) */
+ afs_dentry_delete, /* d_delete(struct dentry *) */
NULL, /* d_release(struct dentry *) */
afs_dentry_iput /* d_iput(struct dentry *, struct inode *) */
};
vattr.va_mode = mode;
AFS_GLOCK();
- code = afs_create((struct vcache*)dip, name, &vattr, NONEXCL, mode,
+ code = afs_create(ITOAFS(dip), name, &vattr, NONEXCL, mode,
(struct vcache**)&ip, credp);
if (!code) {
#endif
dp->d_op = afs_dops;
+ dp->d_time = jiffies;
d_instantiate(dp, ip);
}
struct vcache *vcp=NULL;
const char *comp = dp->d_name.name;
AFS_GLOCK();
- code = afs_lookup((struct vcache *)dip, comp, &vcp, credp);
+ code = afs_lookup(ITOAFS(dip), comp, &vcp, credp);
if (vcp) {
- struct inode *ip = (struct inode*)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_data.a_ops = &afs_symlink_aops;
ip->i_mapping = &ip->i_data;
} else
- printk("afs_linux_lookup: FIXME\n");
+ 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);
#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
- }
+ }
+ dp->d_time = jiffies;
dp->d_op = afs_dops;
- d_add(dp, (struct inode*)vcp);
+ d_add(dp, AFSTOI(vcp));
AFS_GUNLOCK();
crfree(credp);
d_drop(newdp);
AFS_GLOCK();
- code = afs_link((struct vcache*)oldip, (struct vcache*)dip, name, credp);
+ code = afs_link(ITOAFS(oldip), ITOAFS(dip), name, credp);
AFS_GUNLOCK();
crfree(credp);
int code;
cred_t *credp = crref();
const char *name = dp->d_name.name;
- int putback = 0;
-
- if (!list_empty(&dp->d_hash)) {
- d_drop(dp);
- /* Install a definite non-existence if we're the only user. */
-#if defined(AFS_LINUX24_ENV)
- if (atomic_read(&dp->d_count) == 1)
-#else
- if (dp->d_count == 1)
-#endif
- putback = 1;
- }
AFS_GLOCK();
- code = afs_remove((struct vcache*)dip, name, credp);
+ code = afs_remove(ITOAFS(dip), name, credp);
AFS_GUNLOCK();
- if (!code) {
- d_delete(dp);
- if (putback)
- d_add(dp, NULL); /* means definitely does _not_ exist */
- }
+ if (!code)
+ d_drop(dp);
crfree(credp);
return -code;
}
AFS_GLOCK();
VATTR_NULL(&vattr);
- code = afs_symlink((struct vcache*)dip, name, &vattr, target, credp);
+ code = afs_symlink(ITOAFS(dip), name, &vattr, target, credp);
AFS_GUNLOCK();
crfree(credp);
return -code;
VATTR_NULL(&vattr);
vattr.va_mask = ATTR_MODE;
vattr.va_mode = mode;
- code = afs_mkdir((struct vcache*)dip, name, &vattr, &tvcp, credp);
+ code = afs_mkdir(ITOAFS(dip), name, &vattr, &tvcp, credp);
if (tvcp) {
tvcp->v.v_op = &afs_dir_iops;
tvcp->v.v_fop = &afs_dir_fops;
#endif
dp->d_op = afs_dops;
- d_instantiate(dp, (struct inode*)tvcp);
+ dp->d_time = jiffies;
+ d_instantiate(dp, AFSTOI(tvcp));
}
+
AFS_GUNLOCK();
crfree(credp);
return -code;
const char *name = dp->d_name.name;
AFS_GLOCK();
- code = afs_rmdir((struct vcache*)dip, name, credp);
+ code = afs_rmdir(ITOAFS(dip), name, credp);
- /* Linux likes to see ENOTDIR returned from an rmdir() syscall
+ /* Linux likes to see ENOTEMPTY returned from an rmdir() syscall
* that failed because a directory is not empty. So, we map
- * EEXIST to ENOTDIR on linux.
+ * EEXIST to ENOTEMPTY on linux.
*/
if (code == EEXIST) {
- code = ENOTDIR;
+ code = ENOTEMPTY;
}
if (!code) {
- d_delete(dp);
+ d_drop(dp);
}
AFS_GUNLOCK();
d_drop(newdp);
}
AFS_GLOCK();
- code = afs_rename((struct vcache*)oldip, oldname, (struct vcache*)newip,
+ code = afs_rename(ITOAFS(oldip), oldname, ITOAFS(newip),
newname, credp);
AFS_GUNLOCK();
- if (!code)
+ if (!code) {
+ /* update time so it doesn't expire immediately */
+ newdp->d_time = jiffies;
d_move(olddp, newdp);
+ }
crfree(credp);
return -code;
uio_t tuio;
struct iovec iov;
- setup_uio(&tuio, &iov, target, 0, maxlen, UIO_READ, seg);
- code = afs_readlink((struct vcache*)ip, &tuio, credp);
+ setup_uio(&tuio, &iov, target, (afs_offs_t) 0, maxlen, UIO_READ, seg);
+ code = afs_readlink(ITOAFS(ip), &tuio, credp);
crfree(credp);
if (!code)
{
int code = 0;
char *name;
+ struct dentry *res;
+
AFS_GLOCK();
name = osi_Alloc(PATH_MAX+1);
AFS_GUNLOCK();
return res;
}
+#endif
/* afs_linux_readpage
* all reads come through here. A strategy-like read call.
{
int code;
cred_t *credp = crref();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ char *address;
+ afs_offs_t offset = pp->index << PAGE_CACHE_SHIFT;
+#else
ulong address = afs_linux_page_address(pp);
+ afs_offs_t offset = pageoff(pp);
+#endif
uio_t tuio;
struct iovec iovec;
struct inode *ip = FILE_INODE(fp);
int cnt = atomic_read(&pp->count);
+ struct vcache *avc = ITOAFS(ip);
AFS_GLOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_READPAGE,
ICL_TYPE_POINTER, pp,
ICL_TYPE_INT32, cnt,
ICL_TYPE_INT32, 99999); /* not a possible code value */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ address = kmap(pp);
+ ClearPageError(pp);
+
+ lock_kernel();
+#else
atomic_add(1, &pp->count);
set_bit(PG_locked, &pp->flags); /* other bits? See mm.h */
clear_bit(PG_error, &pp->flags);
+#endif
-#if defined(AFS_LINUX24_ENV)
- setup_uio(&tuio, &iovec, (char*)address, pp->index << PAGE_CACHE_SHIFT,
- PAGESIZE, UIO_READ, AFS_UIOSYS);
-#else
- setup_uio(&tuio, &iovec, (char*)address, pp->offset, PAGESIZE,
+ setup_uio(&tuio, &iovec, (char*)address, offset, PAGESIZE,
UIO_READ, AFS_UIOSYS);
-#endif
-#ifdef AFS_LINUX24_ENV
- lock_kernel();
-#endif
- code = afs_rdwr((struct vcache*)ip, &tuio, UIO_READ, 0, credp);
-#ifdef AFS_LINUX24_ENV
+ code = afs_rdwr(avc, &tuio, UIO_READ, 0, credp);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
unlock_kernel();
#endif
if (tuio.uio_resid) /* zero remainder of page */
memset((void*)(address+(PAGESIZE-tuio.uio_resid)), 0,
tuio.uio_resid);
- set_bit(PG_uptodate, &pp->flags);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ flush_dcache_page(pp);
+ SetPageUptodate(pp);
+#else
+ set_bit(PG_uptodate, &pp->flags);
+#endif
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ kunmap(pp);
+ UnlockPage(pp);
+#else
clear_bit(PG_locked, &pp->flags);
wake_up(&pp->wait);
free_page(address);
+#endif
+
+ if (!code && AFS_CHUNKOFFSET(offset) == 0) {
+ struct dcache *tdc;
+ struct vrequest treq;
+
+ code = afs_InitReq(&treq, credp);
+ if (!code && !NBObtainWriteLock(&avc->lock, 534)) {
+ tdc = afs_FindDCache(avc, offset);
+ if (tdc) {
+ if (!(tdc->mflags & DFNextStarted))
+ afs_PrefetchChunk(avc, tdc, credp, &treq);
+ afs_PutDCache(tdc);
+ }
+ ReleaseWriteLock(&avc->lock);
+ }
+ }
crfree(credp);
afs_Trace4(afs_iclSetp, CM_TRACE_READPAGE,
return -code;
}
-#ifdef NOTUSED
-/* afs_linux_writepage - is this used anywhere? swap files via nfs? */
-int afs_linux_writepage(struct inode *ip, struct page *) { return -EINVAL };
+#if defined(AFS_LINUX24_ENV)
+int afs_linux_writepage(struct page *pp)
+{
+ struct address_space *mapping = pp->mapping;
+ struct inode *inode;
+ unsigned long end_index;
+ unsigned offset = PAGE_CACHE_SIZE;
+ long status;
+
+ 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
+#ifdef NOTUSED
/* afs_linux_bmap - supports generic_readpage, but we roll our own. */
int afs_linux_bmap(struct inode *ip, int) { return -EINVAL; }
if (mode & MAY_EXEC) tmp |= VEXEC;
if (mode & MAY_READ) tmp |= VREAD;
if (mode & MAY_WRITE) tmp |= VWRITE;
- code = afs_access((struct vcache*)ip, tmp, credp);
+ code = afs_access(ITOAFS(ip), tmp, credp);
AFS_GUNLOCK();
crfree(credp);
int afs_linux_smap(struct inode *ip, int) { return -EINVAL; }
#endif
+#if defined(AFS_LINUX24_ENV)
+int afs_linux_writepage_sync(struct inode *ip, struct page *pp,
+ unsigned long offset,
+ unsigned int count)
+{
+ struct vcache *vcp = ITOAFS(ip);
+ char *buffer;
+ afs_offs_t base;
+ int code = 0;
+ cred_t *credp;
+ uio_t tuio;
+ struct iovec iovec;
+ int f_flags = 0;
+
+ buffer = kmap(pp) + offset;
+ base = (pp->index << PAGE_CACHE_SHIFT) + offset;
+
+ credp = crref();
+ afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
+ ICL_TYPE_POINTER, pp,
+ ICL_TYPE_INT32, atomic_read(&pp->count),
+ ICL_TYPE_INT32, 99999);
+
+ setup_uio(&tuio, &iovec, buffer, base, count, UIO_WRITE, AFS_UIOSYS);
+
+ code = afs_write(vcp, &tuio, f_flags, credp, 0);
+
+ vcache2inode(vcp);
+
+ if (!code && afs_stats_cmperf.cacheCurrDirtyChunks >
+ afs_stats_cmperf.cacheMaxDirtyChunks) {
+ struct vrequest treq;
+
+ ObtainWriteLock(&vcp->lock, 533);
+ if (!afs_InitReq(&treq, credp))
+ code = afs_DoPartialWrite(vcp, &treq);
+ ReleaseWriteLock(&vcp->lock);
+ }
+ code = code ? -code : count - tuio.uio_resid;
+
+ afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
+ ICL_TYPE_POINTER, pp,
+ ICL_TYPE_INT32, atomic_read(&pp->count),
+ ICL_TYPE_INT32, code);
+
+ crfree(credp);
+ kunmap(pp);
+
+ return code;
+}
+
+static int
+afs_linux_updatepage(struct file *file, struct page *page,
+ unsigned long offset, unsigned int count)
+{
+ struct dentry *dentry = file->f_dentry;
+
+ return afs_linux_writepage_sync(dentry->d_inode, page, offset, count);
+}
+#else
/* afs_linux_updatepage
* What one would have thought was writepage - write dirty page to file.
* Called from generic_file_write. buffer is still in user space. pagep
unsigned long offset,
unsigned int count, int sync)
{
- struct vcache *vcp = (struct vcache *)FILE_INODE(fp);
+ struct vcache *vcp = ITOAFS(FILE_INODE(fp));
u8 *page_addr = (u8*) afs_linux_page_address(pp);
int code = 0;
cred_t *credp;
credp = crref();
AFS_GLOCK();
-#ifdef AFS_LINUX24_ENV
- lock_kernel();
-#endif
afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
ICL_TYPE_POINTER, pp,
ICL_TYPE_INT32, atomic_read(&pp->count),
ICL_TYPE_INT32, 99999);
-#if defined(AFS_LINUX24_ENV)
- setup_uio(&tuio, &iovec, page_addr + offset,
- (pp->index << PAGE_CACHE_SHIFT) + offset, count,
- UIO_WRITE, AFS_UIOSYS);
-#else
- setup_uio(&tuio, &iovec, page_addr + offset, pp->offset + offset, count,
- UIO_WRITE, AFS_UIOSYS);
-#endif
+ setup_uio(&tuio, &iovec, page_addr + offset, (afs_offs_t)(pageoff(pp) + offset),
+ count, UIO_WRITE, AFS_UIOSYS);
code = afs_write(vcp, &tuio, fp->f_flags, credp, 0);
ICL_TYPE_INT32, atomic_read(&pp->count),
ICL_TYPE_INT32, code);
-#ifdef AFS_LINUX24_ENV
- unlock_kernel();
-#endif
AFS_GUNLOCK();
crfree(credp);
clear_bit(PG_locked, &pp->flags);
return code;
}
+#endif
#if defined(AFS_LINUX24_ENV)
static int afs_linux_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to)
{
- long status;
- loff_t pos = ((loff_t)page->index<<PAGE_CACHE_SHIFT) + to;
+ int code;
- status = afs_linux_updatepage(file, page, offset, to-offset, 1);
+ AFS_GLOCK();
+ lock_kernel();
+ code = afs_linux_updatepage(file, page, offset, to-offset);
+ unlock_kernel();
+ AFS_GUNLOCK();
kunmap(page);
- return status;
+ return code;
}
static int afs_linux_prepare_write(struct file *file, struct page *page,
};
struct address_space_operations afs_file_aops = {
readpage: afs_linux_readpage,
+ writepage: afs_linux_writepage,
commit_write: afs_linux_commit_write,
prepare_write: afs_linux_prepare_write,
};
AFS_GLOCK();
lock_kernel();
code = afs_linux_ireadlink(ip, p, PAGE_SIZE, AFS_UIOSYS);
- unlock_kernel();
- AFS_GUNLOCK();
if (code<0)
goto fail;
p[code] = '\0'; /* null terminate? */
+ unlock_kernel();
+ AFS_GUNLOCK();
+
SetPageUptodate(page);
kunmap(page);
UnlockPage(page);
return 0;
fail:
+ unlock_kernel();
+ AFS_GUNLOCK();
+
SetPageError(page);
kunmap(page);
UnlockPage(page);
git://git.openafs.org / openafs.git / blobdiff