#include <linux/pagemap.h>
#include <linux/writeback.h>
#include <linux/pagevec.h>
+#include <linux/aio.h>
#include "afs/lock.h"
#include "afs/afs_bypasscache.h"
#define MAX_ERRNO 1000L
#endif
+int cachefs_noreadpage = 0;
+
extern struct backing_dev_info *afs_backing_dev_info;
extern struct vcache *afs_globalVp;
static inline int
afs_linux_VerifyVCache(struct vcache *avc, cred_t **retcred) {
cred_t *credp = NULL;
- struct vrequest treq;
+ struct vrequest *treq = NULL;
int code;
if (avc->f.states & CStatd) {
credp = crref();
- code = afs_InitReq(&treq, credp);
- if (code == 0)
- code = afs_VerifyVCache2(avc, &treq);
+ code = afs_CreateReq(&treq, credp);
+ if (code == 0) {
+ code = afs_VerifyVCache2(avc, treq);
+ afs_DestroyReq(treq);
+ }
if (retcred != NULL)
*retcred = credp;
}
#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
+# ifdef LINUX_HAS_NONVECTOR_AIO
static ssize_t
-afs_linux_aio_read(struct kiocb *iocb, const struct iovec *iov, unsigned long segs, loff_t pos)
+afs_linux_aio_read(struct kiocb *iocb, char __user *buf, size_t bufsize,
+ loff_t pos)
+# else
+static ssize_t
+afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf,
+ unsigned long bufsize, loff_t pos)
+# endif
{
struct file *fp = iocb->ki_filp;
ssize_t code = 0;
AFS_GLOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_AIOREADOP, ICL_TYPE_POINTER, vcp,
- ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(pos), ICL_TYPE_INT32, segs, ICL_TYPE_INT32,
- 99999);
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(pos), ICL_TYPE_INT32,
+ (afs_int32)bufsize, ICL_TYPE_INT32, 99999);
code = afs_linux_VerifyVCache(vcp, NULL);
if (code == 0) {
* so we optimise by not using it */
osi_FlushPages(vcp, NULL); /* ensure stale pages are gone */
AFS_GUNLOCK();
- code = generic_file_aio_read(iocb, iov, segs, pos);
+ code = generic_file_aio_read(iocb, buf, bufsize, pos);
AFS_GLOCK();
}
afs_Trace4(afs_iclSetp, CM_TRACE_AIOREADOP, ICL_TYPE_POINTER, vcp,
- ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(pos), ICL_TYPE_INT32, segs, ICL_TYPE_INT32,
- code);
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(pos), ICL_TYPE_INT32,
+ (afs_int32)bufsize, ICL_TYPE_INT32, code);
AFS_GUNLOCK();
return code;
}
* mode. Call fake open/close to ensure we do writes of core dumps.
*/
#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
+# ifdef LINUX_HAS_NONVECTOR_AIO
+static ssize_t
+afs_linux_aio_write(struct kiocb *iocb, const char __user *buf, size_t bufsize,
+ loff_t pos)
+# else
static ssize_t
-afs_linux_aio_write(struct kiocb *iocb, const struct iovec *iov, unsigned long segs, loff_t pos)
+afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf,
+ unsigned long bufsize, loff_t pos)
+# endif
{
ssize_t code = 0;
struct vcache *vcp = VTOAFS(iocb->ki_filp->f_dentry->d_inode);
AFS_GLOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_AIOWRITEOP, ICL_TYPE_POINTER, vcp,
- ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(pos), ICL_TYPE_INT32, segs, ICL_TYPE_INT32,
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(pos), ICL_TYPE_INT32,
+ (afs_int32)bufsize, ICL_TYPE_INT32,
(iocb->ki_filp->f_flags & O_APPEND) ? 99998 : 99999);
code = afs_linux_VerifyVCache(vcp, &credp);
ReleaseWriteLock(&vcp->lock);
if (code == 0) {
AFS_GUNLOCK();
- code = generic_file_aio_write(iocb, iov, segs, pos);
+ code = generic_file_aio_write(iocb, buf, bufsize, pos);
AFS_GLOCK();
}
ReleaseWriteLock(&vcp->lock);
afs_Trace4(afs_iclSetp, CM_TRACE_AIOWRITEOP, ICL_TYPE_POINTER, vcp,
- ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(pos), ICL_TYPE_INT32, segs, ICL_TYPE_INT32,
- code);
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(pos), ICL_TYPE_INT32,
+ (afs_int32)bufsize, ICL_TYPE_INT32, code);
if (credp)
crfree(credp);
* handling and use of bulkstats will need to be reflected here as well.
*/
static int
+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+afs_linux_readdir(struct file *fp, struct dir_context *ctx)
+#else
afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
+#endif
{
struct vcache *avc = VTOAFS(FILE_INODE(fp));
- struct vrequest treq;
+ struct vrequest *treq = NULL;
struct dcache *tdc;
int code;
int offset;
AFS_GLOCK();
AFS_STATCNT(afs_readdir);
- code = afs_convert_code(afs_InitReq(&treq, credp));
+ code = afs_convert_code(afs_CreateReq(&treq, credp));
crfree(credp);
if (code)
goto out1;
afs_InitFakeStat(&fakestat);
- code = afs_convert_code(afs_EvalFakeStat(&avc, &fakestat, &treq));
+ code = afs_convert_code(afs_EvalFakeStat(&avc, &fakestat, treq));
if (code)
goto out;
/* update the cache entry */
tagain:
- code = afs_convert_code(afs_VerifyVCache2(avc, &treq));
+ code = afs_convert_code(afs_VerifyVCache2(avc, treq));
if (code)
goto out;
/* get a reference to the entire directory */
- tdc = afs_GetDCache(avc, (afs_size_t) 0, &treq, &origOffset, &tlen, 1);
+ tdc = afs_GetDCache(avc, (afs_size_t) 0, treq, &origOffset, &tlen, 1);
len = tlen;
if (!tdc) {
code = -ENOENT;
* takes an offset in units of blobs, rather than bytes.
*/
code = 0;
+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+ offset = ctx->pos;
+#else
offset = (int) fp->f_pos;
+#endif
while (1) {
dirpos = BlobScan(tdc, offset);
if (!dirpos)
code = afs_dir_GetVerifiedBlob(tdc, dirpos, &entry);
if (code) {
- afs_warn("Corrupt directory (inode %lx, dirpos %d)",
- (unsigned long)&tdc->f.inode, dirpos);
- ReleaseSharedLock(&avc->lock);
- afs_PutDCache(tdc);
+ if (!(avc->f.states & CCorrupt)) {
+ struct cell *tc = afs_GetCellStale(avc->f.fid.Cell, READ_LOCK);
+ afs_warn("Corrupt directory (%d.%d.%d.%d [%s] @%lx, pos %d)",
+ avc->f.fid.Cell, avc->f.fid.Fid.Volume,
+ avc->f.fid.Fid.Vnode, avc->f.fid.Fid.Unique,
+ tc ? tc->cellName : "",
+ (unsigned long)&tdc->f.inode, dirpos);
+ if (tc)
+ afs_PutCell(tc, READ_LOCK);
+ UpgradeSToWLock(&avc->lock, 814);
+ avc->f.states |= CCorrupt;
+ }
code = -ENOENT;
- goto out;
+ goto unlock_out;
}
de = (struct DirEntry *)entry.data;
* holding the GLOCK.
*/
AFS_GUNLOCK();
+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+ /* dir_emit returns a bool - true when it succeeds.
+ * Inverse the result to fit with how we check "code" */
+ code = !dir_emit(ctx, de->name, len, ino, type);
+#else
code = (*filldir) (dirbuf, de->name, len, offset, ino, type);
+#endif
AFS_GLOCK();
}
DRelease(&entry, 0);
/* If filldir didn't fill in the last one this is still pointing to that
* last attempt.
*/
- fp->f_pos = (loff_t) offset;
+ code = 0;
+unlock_out:
+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+ ctx->pos = (loff_t) offset;
+#else
+ fp->f_pos = (loff_t) offset;
+#endif
ReleaseReadLock(&tdc->lock);
afs_PutDCache(tdc);
UpgradeSToWLock(&avc->lock, 813);
avc->dcreaddir = 0;
avc->readdir_pid = 0;
ReleaseSharedLock(&avc->lock);
- code = 0;
out:
afs_PutFakeStat(&fakestat);
+ afs_DestroyReq(treq);
out1:
AFS_GUNLOCK();
return code;
#endif /* F_GETLK64 && F_GETLK != F_GETLK64 */
AFS_GLOCK();
+ if ((vcp->f.states & CRO)) {
+ if (flp->fl_type == F_WRLCK) {
+ code = EBADF;
+ } else {
+ code = 0;
+ }
+ AFS_GUNLOCK();
+ crfree(credp);
+ return code;
+ }
code = afs_convert_code(afs_lockctl(vcp, &flock, cmd, credp));
AFS_GUNLOCK();
afs_linux_flush(struct file *fp)
#endif
{
- struct vrequest treq;
+ struct vrequest *treq = NULL;
struct vcache *vcp;
cred_t *credp;
int code;
credp = crref();
vcp = VTOAFS(FILE_INODE(fp));
- code = afs_InitReq(&treq, credp);
+ code = afs_CreateReq(&treq, credp);
if (code)
goto out;
/* If caching is bypassed for this file, or globally, just return 0 */
UpgradeSToWLock(&vcp->lock, 536);
if (!AFS_IS_DISCONNECTED) {
code = afs_StoreAllSegments(vcp,
- &treq,
+ treq,
AFS_SYNC | AFS_LASTSTORE);
} else {
afs_DisconAddDirty(vcp, VDisconWriteOsiFlush, 1);
}
ConvertWToSLock(&vcp->lock);
}
- code = afs_CheckCode(code, &treq, 54);
+ code = afs_CheckCode(code, treq, 54);
ReleaseSharedLock(&vcp->lock);
out:
+ afs_DestroyReq(treq);
AFS_DISCON_UNLOCK();
AFS_GUNLOCK();
struct file_operations afs_dir_fops = {
.read = generic_read_dir,
+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+ .iterate = afs_linux_readdir,
+#else
.readdir = afs_linux_readdir,
+#endif
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = afs_unlocked_xioctl,
#else
#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
.aio_read = afs_linux_aio_read,
.aio_write = afs_linux_aio_write,
+ .read = do_sync_read,
+ .write = do_sync_write,
#else
.read = afs_linux_read,
.write = afs_linux_write,
.llseek = default_llseek,
};
+static struct dentry *
+canonical_dentry(struct inode *ip)
+{
+ struct vcache *vcp = VTOAFS(ip);
+ struct dentry *first = NULL, *ret = NULL, *cur;
+#if defined(D_ALIAS_IS_HLIST) && !defined(HLIST_ITERATOR_NO_NODE)
+ struct hlist_node *p;
+#endif
+
+ /* general strategy:
+ * if vcp->target_link is set, and can be found in ip->i_dentry, use that.
+ * otherwise, use the first dentry in ip->i_dentry.
+ * if ip->i_dentry is empty, use the 'dentry' argument we were given.
+ */
+ /* note that vcp->target_link specifies which dentry to use, but we have
+ * no reference held on that dentry. so, we cannot use or dereference
+ * vcp->target_link itself, since it may have been freed. instead, we only
+ * use it to compare to pointers in the ip->i_dentry list. */
+
+ d_prune_aliases(ip);
+
+# ifdef HAVE_DCACHE_LOCK
+ spin_lock(&dcache_lock);
+# else
+ spin_lock(&ip->i_lock);
+# endif
+
+#if defined(D_ALIAS_IS_HLIST)
+# if defined(HLIST_ITERATOR_NO_NODE)
+ hlist_for_each_entry(cur, &ip->i_dentry, d_alias) {
+# else
+ hlist_for_each_entry(cur, p, &ip->i_dentry, d_alias) {
+# endif
+#else
+ list_for_each_entry_reverse(cur, &ip->i_dentry, d_alias) {
+#endif
+
+ if (!vcp->target_link || cur == vcp->target_link) {
+ ret = cur;
+ break;
+ }
+
+ if (!first) {
+ first = cur;
+ }
+ }
+ if (!ret && first) {
+ ret = first;
+ }
+
+ vcp->target_link = ret;
+
+# ifdef HAVE_DCACHE_LOCK
+ if (ret) {
+ dget_locked(ret);
+ }
+ spin_unlock(&dcache_lock);
+# else
+ if (ret) {
+ dget(ret);
+ }
+ spin_unlock(&ip->i_lock);
+# endif
+
+ return ret;
+}
/**********************************************************************
* AFS Linux dentry operations
static int
afs_linux_revalidate(struct dentry *dp)
{
- struct vattr vattr;
+ struct vattr *vattr = NULL;
struct vcache *vcp = VTOAFS(dp->d_inode);
cred_t *credp;
int code;
AFS_GLOCK();
+ code = afs_CreateAttr(&vattr);
+ if (code) {
+ goto out;
+ }
+
#ifdef notyet
/* Make this a fast path (no crref), since it's called so often. */
if (vcp->states & CStatd) {
crfree(credp);
}
}
+ afs_DestroyAttr(vattr);
return 0;
}
#endif
(!afs_fakestat_enable || vcp->mvstat != 1) &&
!afs_nfsexporter &&
(vType(vcp) == VDIR || vType(vcp) == VLNK)) {
- code = afs_CopyOutAttrs(vcp, &vattr);
+ code = afs_CopyOutAttrs(vcp, vattr);
} else {
credp = crref();
- code = afs_getattr(vcp, &vattr, credp);
+ code = afs_getattr(vcp, vattr, credp);
crfree(credp);
}
if (!code)
- afs_fill_inode(AFSTOV(vcp), &vattr);
+ afs_fill_inode(AFSTOV(vcp), vattr);
+
+ afs_DestroyAttr(vattr);
+out:
AFS_GUNLOCK();
return afs_convert_code(code);
if (iattrp->ia_valid & ATTR_MODE)
vattrp->va_mode = iattrp->ia_mode;
if (iattrp->ia_valid & ATTR_UID)
- vattrp->va_uid = iattrp->ia_uid;
+ vattrp->va_uid = afs_from_kuid(iattrp->ia_uid);
if (iattrp->ia_valid & ATTR_GID)
- vattrp->va_gid = iattrp->ia_gid;
+ vattrp->va_gid = afs_from_kgid(iattrp->ia_gid);
if (iattrp->ia_valid & ATTR_SIZE)
vattrp->va_size = iattrp->ia_size;
if (iattrp->ia_valid & ATTR_ATIME) {
#endif
ip->i_rdev = vp->va_rdev;
ip->i_mode = vp->va_mode;
- ip->i_uid = vp->va_uid;
- ip->i_gid = vp->va_gid;
+ ip->i_uid = afs_make_kuid(vp->va_uid);
+ ip->i_gid = afs_make_kgid(vp->va_gid);
i_size_write(ip, vp->va_size);
ip->i_atime.tv_sec = vp->va_atime.tv_sec;
ip->i_atime.tv_nsec = 0;
static int
afs_notify_change(struct dentry *dp, struct iattr *iattrp)
{
- struct vattr vattr;
+ struct vattr *vattr = NULL;
cred_t *credp = crref();
struct inode *ip = dp->d_inode;
int code;
- VATTR_NULL(&vattr);
- iattr2vattr(&vattr, iattrp); /* Convert for AFS vnodeops call. */
-
AFS_GLOCK();
- code = afs_setattr(VTOAFS(ip), &vattr, credp);
+ code = afs_CreateAttr(&vattr);
+ if (code) {
+ goto out;
+ }
+
+ iattr2vattr(vattr, iattrp); /* Convert for AFS vnodeops call. */
+
+ code = afs_setattr(VTOAFS(ip), vattr, credp);
if (!code) {
- afs_getattr(VTOAFS(ip), &vattr, credp);
- vattr2inode(ip, &vattr);
+ afs_getattr(VTOAFS(ip), vattr, credp);
+ vattr2inode(ip, vattr);
}
+ afs_DestroyAttr(vattr);
+
+out:
AFS_GUNLOCK();
crfree(credp);
return afs_convert_code(code);
return err;
}
+static afs_uint32
+parent_vcache_dv(struct inode *inode, cred_t *credp)
+{
+ int free_cred = 0;
+ struct vcache *pvcp;
+
+ /*
+ * If parent is a mount point and we are using fakestat, we may need
+ * to look at the fake vcache entry instead of what the vfs is giving
+ * us. The fake entry is the one with the useful DataVersion.
+ */
+ pvcp = VTOAFS(inode);
+ if (pvcp->mvstat == 1 && afs_fakestat_enable) {
+ struct vrequest treq;
+ struct afs_fakestat_state fakestate;
+
+ if (!credp) {
+ credp = crref();
+ free_cred = 1;
+ }
+ afs_InitReq(&treq, credp);
+ afs_InitFakeStat(&fakestate);
+ afs_TryEvalFakeStat(&pvcp, &fakestate, &treq);
+ if (free_cred)
+ crfree(credp);
+ afs_PutFakeStat(&fakestate);
+ }
+ return hgetlo(pvcp->f.m.DataVersion);
+}
+
/* 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
* The code here assumes that on entry the global lock is not held
*/
static int
-#ifdef DOP_REVALIDATE_TAKES_NAMEIDATA
+#if defined(DOP_REVALIDATE_TAKES_UNSIGNED)
+afs_linux_dentry_revalidate(struct dentry *dp, unsigned int flags)
+#elif defined(DOP_REVALIDATE_TAKES_NAMEIDATA)
afs_linux_dentry_revalidate(struct dentry *dp, struct nameidata *nd)
#else
afs_linux_dentry_revalidate(struct dentry *dp, int flags)
#endif
{
- struct vattr vattr;
cred_t *credp = NULL;
struct vcache *vcp, *pvcp, *tvc = NULL;
struct dentry *parent;
int valid;
struct afs_fakestat_state fakestate;
int locked = 0;
+ int force_drop = 0;
+ afs_uint32 parent_dv;
#ifdef LOOKUP_RCU
/* We don't support RCU path walking */
+# if defined(DOP_REVALIDATE_TAKES_UNSIGNED)
+ if (flags & LOOKUP_RCU)
+# else
if (nd->flags & LOOKUP_RCU)
+# endif
return -ECHILD;
#endif
parent = dget_parent(dp);
pvcp = VTOAFS(parent->d_inode);
- if ((vcp->mvstat == 1) || (vcp->mvstat == 2)) { /* need to lock */
+ if ((vcp->mvstat == 1) || (vcp->mvstat == 2) ||
+ (pvcp->mvstat == 1 && afs_fakestat_enable)) { /* need to lock */
credp = crref();
AFS_GLOCK();
locked = 1;
if (vcp->mvid && (vcp->f.states & CMValid)) {
int tryEvalOnly = 0;
int code = 0;
- struct vrequest treq;
+ struct vrequest *treq = NULL;
- code = afs_InitReq(&treq, credp);
- if (
- (strcmp(dp->d_name.name, ".directory") == 0)) {
+ code = afs_CreateReq(&treq, credp);
+ if (code) {
+ dput(parent);
+ goto bad_dentry;
+ }
+ if ((strcmp(dp->d_name.name, ".directory") == 0)) {
tryEvalOnly = 1;
}
if (tryEvalOnly)
- code = afs_TryEvalFakeStat(&vcp, &fakestate, &treq);
+ code = afs_TryEvalFakeStat(&vcp, &fakestate, treq);
else
- code = afs_EvalFakeStat(&vcp, &fakestate, &treq);
+ code = afs_EvalFakeStat(&vcp, &fakestate, treq);
+ afs_DestroyReq(treq);
if ((tryEvalOnly && vcp->mvstat == 1) || code) {
/* a mount point, not yet replaced by its directory */
+ dput(parent);
goto bad_dentry;
}
}
* 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))
+ if (!afs_AccessOK(vcp, (vType(vcp) == VREG) ? PRSFS_READ : PRSFS_LOOKUP, &treq, CHECK_MODE_BITS)) {
+ dput(parent);
goto bad_dentry;
+ }
vcp->last_looker = treq.uid;
}
#endif
+ parent_dv = parent_vcache_dv(parent->d_inode, credp);
/* 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 ((!locked) && (hgetlo(pvcp->f.m.DataVersion) > dp->d_time || !(vcp->f.states & CStatd)) ) {
+ if ((!locked) && (parent_dv > dp->d_time || !(vcp->f.states & CStatd)) ) {
credp = crref();
AFS_GLOCK();
locked = 1;
}
- if (locked && (hgetlo(pvcp->f.m.DataVersion) > dp->d_time || !(vcp->f.states & CStatd))) {
- afs_lookup(pvcp, (char *)dp->d_name.name, &tvc, credp);
+ if (locked && (parent_dv > dp->d_time || !(vcp->f.states & CStatd))) {
+ struct vattr *vattr = NULL;
+ int code;
+
+ code = afs_lookup(pvcp, (char *)dp->d_name.name, &tvc, credp);
if (!tvc || tvc != vcp) {
dput(parent);
+ /* Force unhash if name is known not to exist. */
+ if (code == ENOENT)
+ force_drop = 1;
+ goto bad_dentry;
+ }
+
+ code = afs_CreateAttr(&vattr);
+ if (code) {
+ dput(parent);
goto bad_dentry;
}
- if (afs_getattr(vcp, &vattr, credp)) {
+ if (afs_getattr(vcp, vattr, credp)) {
dput(parent);
+ afs_DestroyAttr(vattr);
goto bad_dentry;
}
- vattr2inode(AFSTOV(vcp), &vattr);
- dp->d_time = hgetlo(pvcp->f.m.DataVersion);
+ vattr2inode(AFSTOV(vcp), vattr);
+ dp->d_time = parent_dv;
+
+ afs_DestroyAttr(vattr);
}
/* should we always update the attributes at this point? */
crfree(credp);
if (!valid) {
- shrink_dcache_parent(dp);
- d_drop(dp);
+ /*
+ * If we had a negative lookup for the name we want to forcibly
+ * unhash the dentry.
+ * Otherwise use d_invalidate which will not unhash it if still in use.
+ */
+ if (force_drop) {
+ shrink_dcache_parent(dp);
+ d_drop(dp);
+ } else
+ d_invalidate(dp);
}
+
return valid;
bad_dentry:
return 0;
}
+#ifdef STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT
+static struct vfsmount *
+afs_dentry_automount(afs_linux_path_t *path)
+{
+ struct dentry *target;
+
+ /* avoid symlink resolution limits when resolving; we cannot contribute to
+ * an infinite symlink loop */
+ current->total_link_count--;
+
+ target = canonical_dentry(path->dentry->d_inode);
+
+ if (target == path->dentry) {
+ dput(target);
+ target = NULL;
+ }
+
+ if (target) {
+ dput(path->dentry);
+ path->dentry = target;
+
+ } else {
+ spin_lock(&path->dentry->d_lock);
+ path->dentry->d_flags &= ~DCACHE_NEED_AUTOMOUNT;
+ spin_unlock(&path->dentry->d_lock);
+ }
+
+ return NULL;
+}
+#endif /* STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT */
+
struct dentry_operations afs_dentry_operations = {
.d_revalidate = afs_linux_dentry_revalidate,
.d_delete = afs_dentry_delete,
.d_iput = afs_dentry_iput,
+#ifdef STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT
+ .d_automount = afs_dentry_automount,
+#endif /* STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT */
};
/**********************************************************************
* name is in kernel space at this point.
*/
static int
-#if defined(IOP_MKDIR_TAKES_UMODE_T)
+#if defined(IOP_CREATE_TAKES_BOOL)
+afs_linux_create(struct inode *dip, struct dentry *dp, umode_t mode,
+ bool excl)
+#elif defined(IOP_CREATE_TAKES_UMODE_T)
afs_linux_create(struct inode *dip, struct dentry *dp, umode_t mode,
struct nameidata *nd)
-#else
-#ifdef IOP_CREATE_TAKES_NAMEIDATA
+#elif defined(IOP_CREATE_TAKES_NAMEIDATA)
afs_linux_create(struct inode *dip, struct dentry *dp, int mode,
struct nameidata *nd)
#else
afs_linux_create(struct inode *dip, struct dentry *dp, int mode)
#endif
-#endif
{
- struct vattr vattr;
+ struct vattr *vattr = NULL;
cred_t *credp = crref();
const char *name = dp->d_name.name;
struct vcache *vcp;
int code;
- VATTR_NULL(&vattr);
- vattr.va_mode = mode;
- vattr.va_type = mode & S_IFMT;
-
AFS_GLOCK();
- code = afs_create(VTOAFS(dip), (char *)name, &vattr, NONEXCL, mode,
+
+ code = afs_CreateAttr(&vattr);
+ if (code) {
+ goto out;
+ }
+ vattr->va_mode = mode;
+ vattr->va_type = mode & S_IFMT;
+
+ code = afs_create(VTOAFS(dip), (char *)name, vattr, NONEXCL, mode,
&vcp, credp);
if (!code) {
struct inode *ip = AFSTOV(vcp);
- afs_getattr(vcp, &vattr, credp);
- afs_fill_inode(ip, &vattr);
+ afs_getattr(vcp, vattr, credp);
+ afs_fill_inode(ip, vattr);
insert_inode_hash(ip);
#if !defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
dp->d_op = &afs_dentry_operations;
#endif
- dp->d_time = hgetlo(VTOAFS(dip)->f.m.DataVersion);
+ dp->d_time = parent_vcache_dv(dip, credp);
d_instantiate(dp, ip);
}
+
+ afs_DestroyAttr(vattr);
+
+out:
AFS_GUNLOCK();
crfree(credp);
/* afs_linux_lookup */
static struct dentry *
-#ifdef IOP_LOOKUP_TAKES_NAMEIDATA
+#if defined(IOP_LOOKUP_TAKES_UNSIGNED)
+afs_linux_lookup(struct inode *dip, struct dentry *dp,
+ unsigned flags)
+#elif defined(IOP_LOOKUP_TAKES_NAMEIDATA)
afs_linux_lookup(struct inode *dip, struct dentry *dp,
struct nameidata *nd)
#else
code = afs_lookup(VTOAFS(dip), (char *)comp, &vcp, credp);
if (vcp) {
- struct vattr vattr;
+ struct vattr *vattr = NULL;
+ struct vcache *parent_vc = VTOAFS(dip);
+
+ if (parent_vc == vcp) {
+ /* This is possible if the parent dir is a mountpoint to a volume,
+ * and the dir entry we looked up is a mountpoint to the same
+ * volume. Linux cannot cope with this, so return an error instead
+ * of risking a deadlock or panic. */
+ afs_PutVCache(vcp);
+ code = EDEADLK;
+ AFS_GUNLOCK();
+ goto done;
+ }
+
+ code = afs_CreateAttr(&vattr);
+ if (code) {
+ afs_PutVCache(vcp);
+ AFS_GUNLOCK();
+ goto done;
+ }
ip = AFSTOV(vcp);
- afs_getattr(vcp, &vattr, credp);
- afs_fill_inode(ip, &vattr);
+ afs_getattr(vcp, vattr, credp);
+ afs_fill_inode(ip, vattr);
if (hlist_unhashed(&ip->i_hash))
insert_inode_hash(ip);
+
+ afs_DestroyAttr(vattr);
}
#if !defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
dp->d_op = &afs_dentry_operations;
#endif
- dp->d_time = hgetlo(VTOAFS(dip)->f.m.DataVersion);
+ dp->d_time = parent_vcache_dv(dip, credp);
+
AFS_GUNLOCK();
if (ip && S_ISDIR(ip->i_mode)) {
- struct dentry *alias;
-
- /* Try to invalidate an existing alias in favor of our new one */
- alias = d_find_alias(ip);
- /* But not if it's disconnected; then we want d_splice_alias below */
- if (alias && !(alias->d_flags & DCACHE_DISCONNECTED)) {
- if (d_invalidate(alias) == 0) {
- dput(alias);
- } else {
- iput(ip);
- crfree(credp);
- return alias;
- }
- }
+ d_prune_aliases(ip);
+
+#ifdef STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT
+ ip->i_flags |= S_AUTOMOUNT;
+#endif
}
newdp = d_splice_alias(ip, dp);
+ done:
crfree(credp);
/* It's ok for the file to not be found. That's noted by the caller by
{
int code;
cred_t *credp = crref();
- struct vattr vattr;
+ struct vattr *vattr = NULL;
const char *name = dp->d_name.name;
/* If afs_symlink returned the vnode, we could instantiate the
*/
d_drop(dp);
- VATTR_NULL(&vattr);
AFS_GLOCK();
- code = afs_symlink(VTOAFS(dip), (char *)name, &vattr, (char *)target, credp);
+ code = afs_CreateAttr(&vattr);
+ if (code) {
+ goto out;
+ }
+
+ code = afs_symlink(VTOAFS(dip), (char *)name, vattr, (char *)target, NULL,
+ credp);
+ afs_DestroyAttr(vattr);
+
+out:
AFS_GUNLOCK();
crfree(credp);
return afs_convert_code(code);
int code;
cred_t *credp = crref();
struct vcache *tvcp = NULL;
- struct vattr vattr;
+ struct vattr *vattr = NULL;
const char *name = dp->d_name.name;
- VATTR_NULL(&vattr);
- vattr.va_mask = ATTR_MODE;
- vattr.va_mode = mode;
AFS_GLOCK();
- code = afs_mkdir(VTOAFS(dip), (char *)name, &vattr, &tvcp, credp);
+ code = afs_CreateAttr(&vattr);
+ if (code) {
+ goto out;
+ }
+
+ vattr->va_mask = ATTR_MODE;
+ vattr->va_mode = mode;
+
+ code = afs_mkdir(VTOAFS(dip), (char *)name, vattr, &tvcp, credp);
if (tvcp) {
struct inode *ip = AFSTOV(tvcp);
- afs_getattr(tvcp, &vattr, credp);
- afs_fill_inode(ip, &vattr);
+ afs_getattr(tvcp, vattr, credp);
+ afs_fill_inode(ip, vattr);
#if !defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
dp->d_op = &afs_dentry_operations;
dp->d_time = hgetlo(VTOAFS(dip)->f.m.DataVersion);
d_instantiate(dp, ip);
}
+ afs_DestroyAttr(vattr);
+
+out:
AFS_GUNLOCK();
crfree(credp);
rehash = newdp;
}
-#if defined(D_COUNT_INT)
- spin_lock(&olddp->d_lock);
- if (olddp->d_count > 1) {
- spin_unlock(&olddp->d_lock);
- shrink_dcache_parent(olddp);
- } else
- spin_unlock(&olddp->d_lock);
-#else
- if (atomic_read(&olddp->d_count) > 1)
- shrink_dcache_parent(olddp);
-#endif
+ afs_maybe_shrink_dcache(olddp);
AFS_GLOCK();
code = afs_rename(VTOAFS(oldip), (char *)oldname, VTOAFS(newip), (char *)newname, credp);
if (cacheDiskType != AFS_FCACHE_TYPE_UFS)
return 0;
+ /* No readpage (ex: tmpfs) , skip */
+ if (cachefs_noreadpage)
+ return 0;
+
/* Can't do anything if the vcache isn't statd , or if the read
* crosses a chunk boundary.
*/
/* Is the dcache we've been given currently up to date */
if (!hsame(avc->f.m.DataVersion, tdc->f.versionNo) ||
- (tdc->dflags & DFFetching)) {
- ReleaseWriteLock(&avc->lock);
- ReleaseReadLock(&tdc->lock);
- afs_PutDCache(tdc);
- return 0;
- }
+ (tdc->dflags & DFFetching))
+ goto out;
/* Update our hint for future abuse */
avc->dchint = tdc;
/* XXX - I suspect we should be locking the inodes before we use them! */
AFS_GUNLOCK();
cacheFp = afs_linux_raw_open(&tdc->f.inode);
+ if (!cacheFp->f_dentry->d_inode->i_mapping->a_ops->readpage) {
+ cachefs_noreadpage = 1;
+ AFS_GLOCK();
+ goto out;
+ }
pagevec_init(&lrupv, 0);
code = afs_linux_read_cache(cacheFp, pp, tdc->f.chunk, &lrupv, NULL);
*codep = code;
return 1;
+
+out:
+ ReleaseWriteLock(&avc->lock);
+ ReleaseReadLock(&tdc->lock);
+ afs_PutDCache(tdc);
+ return 0;
}
/* afs_linux_readpage
if (AFS_CHUNKOFFSET(offset) == 0) {
struct dcache *tdc;
- struct vrequest treq;
+ struct vrequest *treq = NULL;
cred_t *credp;
credp = crref();
AFS_GLOCK();
- code = afs_InitReq(&treq, credp);
+ code = afs_CreateReq(&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_PrefetchChunk(avc, tdc, credp, treq);
afs_PutDCache(tdc);
}
ReleaseWriteLock(&avc->lock);
}
+ afs_DestroyReq(treq);
AFS_GUNLOCK();
crfree(credp);
}
if(page_ix == 0) {
offset = page_offset(pp);
- auio->uio_offset = offset;
+ ancr->offset = auio->uio_offset = offset;
base_index = pp->index;
}
iovecp[page_ix].iov_len = PAGE_SIZE;
static inline int
afs_linux_can_bypass(struct inode *ip) {
+
switch(cache_bypass_strategy) {
case NEVER_BYPASS_CACHE:
return 0;
case ALWAYS_BYPASS_CACHE:
return 1;
case LARGE_FILES_BYPASS_CACHE:
- if(i_size_read(ip) > cache_bypass_threshold)
+ if (i_size_read(ip) > cache_bypass_threshold)
return 1;
default:
return 0;
if (cacheDiskType == AFS_FCACHE_TYPE_MEM)
return 0;
+ /* No readpage (ex: tmpfs) , skip */
+ if (cachefs_noreadpage)
+ return 0;
+
AFS_GLOCK();
if ((code = afs_linux_VerifyVCache(avc, NULL))) {
AFS_GUNLOCK();
}
}
AFS_GUNLOCK();
- if (tdc)
+ if (tdc) {
cacheFp = afs_linux_raw_open(&tdc->f.inode);
+ if (!cacheFp->f_dentry->d_inode->i_mapping->a_ops->readpage) {
+ cachefs_noreadpage = 1;
+ goto out;
+ }
+ }
}
if (tdc && !add_to_page_cache(page, mapping, page->index,
if (pagevec_count(&lrupv))
__pagevec_lru_add_file(&lrupv);
+out:
if (tdc)
filp_close(cacheFp, NULL);
static inline int
afs_linux_dopartialwrite(struct vcache *avc, cred_t *credp) {
- struct vrequest treq;
+ struct vrequest *treq = NULL;
int code = 0;
- if (!afs_InitReq(&treq, credp))
- code = afs_DoPartialWrite(avc, &treq);
+ if (!afs_CreateReq(&treq, credp)) {
+ code = afs_DoPartialWrite(avc, treq);
+ afs_DestroyReq(treq);
+ }
return afs_convert_code(code);
}
}
#endif
+#ifndef STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT
+static void *
+afs_linux_dir_follow_link(struct dentry *dentry, struct nameidata *nd)
+{
+ struct dentry **dpp;
+ struct dentry *target;
+
+ if (current->total_link_count > 0) {
+ /* avoid symlink resolution limits when resolving; we cannot contribute to
+ * an infinite symlink loop */
+ /* only do this for follow_link when total_link_count is positive to be
+ * on the safe side; there is at least one code path in the Linux
+ * kernel where it seems like it may be possible to get here without
+ * total_link_count getting incremented. it is not clear on how that
+ * path is actually reached, but guard against it just to be safe */
+ current->total_link_count--;
+ }
+
+ target = canonical_dentry(dentry->d_inode);
+
+# ifdef STRUCT_NAMEIDATA_HAS_PATH
+ dpp = &nd->path.dentry;
+# else
+ dpp = &nd->dentry;
+# endif
+
+ dput(*dpp);
+
+ if (target) {
+ *dpp = target;
+ } else {
+ *dpp = dget(dentry);
+ }
+
+ nd->last_type = LAST_BIND;
+
+ return NULL;
+}
+#endif /* !STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT */
+
static struct inode_operations afs_file_iops = {
.permission = afs_linux_permission,
.rename = afs_linux_rename,
.getattr = afs_linux_getattr,
.permission = afs_linux_permission,
+#ifndef STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT
+ .follow_link = afs_linux_dir_follow_link,
+#endif
};
/* We really need a separate symlink set of ops, since do_follow_link()
git://git.openafs.org / openafs.git / blobdiff