/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
* So far the only truly scary part is that Linux relies on the inode cache
* to be up to date. Don't you dare break a callback and expect an fstat
* to give you meaningful information. This appears to be fixed in the 2.1
- * development kernels. As it is we can fix this now by intercepting the
+ * development kernels. As it is we can fix this now by intercepting the
* stat calls.
*/
#define MAX_ERRNO 1000L
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
+/* Enable our workaround for a race with d_splice_alias. The race was fixed in
+ * 2.6.34, so don't do it after that point. */
+# define D_SPLICE_ALIAS_RACE
+#endif
+
+/* Workaround for RH 7.5 which introduced file operation iterate() but requires
+ * each file->f_mode to be marked with FMODE_KABI_ITERATE. Instead OpenAFS will
+ * continue to use file opearation readdir() in this case.
+ */
+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE) && !defined(FMODE_KABI_ITERATE)
+#define USE_FOP_ITERATE 1
+#else
+#undef USE_FOP_ITERATE
+#endif
+
int cachefs_noreadpage = 0;
extern struct backing_dev_info *afs_backing_dev_info;
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;
return afs_convert_code(code);
}
-#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
-# ifdef LINUX_HAS_NONVECTOR_AIO
+#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ)
+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
+static ssize_t
+afs_linux_read_iter(struct kiocb *iocb, struct iov_iter *iter)
+# elif defined(LINUX_HAS_NONVECTOR_AIO)
static ssize_t
afs_linux_aio_read(struct kiocb *iocb, char __user *buf, size_t bufsize,
loff_t pos)
struct file *fp = iocb->ki_filp;
ssize_t code = 0;
struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode);
+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
+ loff_t pos = iocb->ki_pos;
+ unsigned long bufsize = iter->nr_segs;
+# endif
+
AFS_GLOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_AIOREADOP, ICL_TYPE_POINTER, vcp,
* so we optimise by not using it */
osi_FlushPages(vcp, NULL); /* ensure stale pages are gone */
AFS_GUNLOCK();
+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
+ code = generic_file_read_iter(iocb, iter);
+# else
code = generic_file_aio_read(iocb, buf, bufsize, pos);
+# endif
AFS_GLOCK();
}
* also take care of re-positioning the pointer if file is open in append
* 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
+#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ)
+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
+static ssize_t
+afs_linux_write_iter(struct kiocb *iocb, struct iov_iter *iter)
+# elif defined(LINUX_HAS_NONVECTOR_AIO)
static ssize_t
afs_linux_aio_write(struct kiocb *iocb, const char __user *buf, size_t bufsize,
loff_t pos)
ssize_t code = 0;
struct vcache *vcp = VTOAFS(iocb->ki_filp->f_dentry->d_inode);
cred_t *credp;
+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
+ loff_t pos = iocb->ki_pos;
+ unsigned long bufsize = iter->nr_segs;
+# endif
AFS_GLOCK();
ReleaseWriteLock(&vcp->lock);
if (code == 0) {
AFS_GUNLOCK();
+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
+ code = generic_file_write_iter(iocb, iter);
+# else
code = generic_file_aio_write(iocb, buf, bufsize, pos);
+# endif
AFS_GLOCK();
}
}
#endif
-extern int BlobScan(struct dcache * afile, afs_int32 ablob);
+extern int BlobScan(struct dcache * afile, afs_int32 ablob, afs_int32 *ablobOut);
/* This is a complete rewrite of afs_readdir, since we can make use of
* filldir instead of afs_readdir_move. Note that changes to vcache/dcache
* handling and use of bulkstats will need to be reflected here as well.
*/
static int
-#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+#if defined(USE_FOP_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;
- int dirpos;
+ afs_int32 dirpos;
struct DirEntry *de;
struct DirBuffer entry;
ino_t ino;
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;
+ code = -EIO;
goto out;
}
ObtainWriteLock(&avc->lock, 811);
* takes an offset in units of blobs, rather than bytes.
*/
code = 0;
-#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+#if defined(USE_FOP_ITERATE)
offset = ctx->pos;
#else
offset = (int) fp->f_pos;
#endif
while (1) {
- dirpos = BlobScan(tdc, offset);
- if (!dirpos)
+ code = BlobScan(tdc, offset, &dirpos);
+ if (code || !dirpos)
break;
code = afs_dir_GetVerifiedBlob(tdc, dirpos, &entry);
if (code) {
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)",
+ afs_warn("afs: Corrupt directory (%d.%d.%d.%d [%s] @%lx, pos %d)\n",
avc->f.fid.Cell, avc->f.fid.Fid.Volume,
avc->f.fid.Fid.Vnode, avc->f.fid.Fid.Unique,
tc ? tc->cellName : "",
UpgradeSToWLock(&avc->lock, 814);
avc->f.states |= CCorrupt;
}
- code = -ENOENT;
+ code = -EIO;
goto unlock_out;
}
if ((avc->f.states & CForeign) == 0 && (ntohl(de->fid.vnode) & 1)) {
type = DT_DIR;
} else if ((tvc = afs_FindVCache(&afid, 0, 0))) {
- if (tvc->mvstat) {
+ if (tvc->mvstat != AFS_MVSTAT_FILE) {
type = DT_DIR;
} else if (((tvc->f.states) & (CStatd | CTruth))) {
/* CTruth will be set if the object has
/* clean up from afs_FindVCache */
afs_PutVCache(tvc);
}
- /*
+ /*
* If this is NFS readdirplus, then the filler is going to
* call getattr on this inode, which will deadlock if we're
* holding the GLOCK.
*/
AFS_GUNLOCK();
-#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+#if defined(USE_FOP_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);
code = 0;
unlock_out:
-#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
+#if defined(USE_FOP_ITERATE)
ctx->pos = (loff_t) offset;
#else
fp->f_pos = (loff_t) offset;
out:
afs_PutFakeStat(&fakestat);
+ afs_DestroyReq(treq);
out1:
AFS_GUNLOCK();
return code;
cred_t *credp = crref();
#if defined(FOP_FSYNC_TAKES_RANGE)
- mutex_lock(&ip->i_mutex);
+ afs_linux_lock_inode(ip);
#endif
AFS_GLOCK();
code = afs_fsync(VTOAFS(ip), credp);
AFS_GUNLOCK();
#if defined(FOP_FSYNC_TAKES_RANGE)
- mutex_unlock(&ip->i_mutex);
+ afs_linux_unlock_inode(ip);
#endif
crfree(credp);
return afs_convert_code(code);
struct vcache *vcp = VTOAFS(FILE_INODE(fp));
cred_t *credp = crref();
struct AFS_FLOCK flock;
-
+
/* Convert to a lock format afs_lockctl understands. */
memset(&flock, 0, sizeof(flock));
flock.l_type = flp->fl_type;
#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();
- if ((code == 0 || flp->fl_type == F_UNLCK) &&
+ if ((code == 0 || flp->fl_type == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
code = afs_posix_lock_file(fp, flp);
if (code && flp->fl_type != F_UNLCK) {
return 0;
}
}
-
+
/* Convert flock back to Linux's file_lock */
flp->fl_type = flock.l_type;
flp->fl_pid = flock.l_pid;
code = afs_convert_code(afs_lockctl(vcp, &flock, cmd, credp));
AFS_GUNLOCK();
- if ((code == 0 || flp->fl_type == F_UNLCK) &&
+ if ((code == 0 || flp->fl_type == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
flp->fl_flags &=~ FL_SLEEP;
code = flock_lock_file_wait(fp, flp);
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)
+#if defined(USE_FOP_ITERATE)
.iterate = afs_linux_readdir,
#else
.readdir = afs_linux_readdir,
};
struct file_operations afs_file_fops = {
-#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
+#ifdef STRUCT_FILE_OPERATIONS_HAS_READ_ITER
+ .read_iter = afs_linux_read_iter,
+ .write_iter = afs_linux_write_iter,
+# if !defined(HAVE_LINUX___VFS_WRITE) && !defined(HAVE_LINUX_KERNEL_WRITE)
+ .read = new_sync_read,
+ .write = new_sync_write,
+# endif
+#elif defined(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,
#if defined(STRUCT_FILE_OPERATIONS_HAS_SENDFILE)
.sendfile = generic_file_sendfile,
#endif
-#if defined(STRUCT_FILE_OPERATIONS_HAS_SPLICE)
+#if defined(STRUCT_FILE_OPERATIONS_HAS_SPLICE) && !defined(HAVE_LINUX_DEFAULT_FILE_SPLICE_READ)
+# if defined(HAVE_LINUX_ITER_FILE_SPLICE_WRITE)
+ .splice_write = iter_file_splice_write,
+# else
.splice_write = generic_file_splice_write,
+# endif
.splice_read = generic_file_splice_read,
#endif
.release = afs_linux_release,
d_prune_aliases(ip);
-# ifdef HAVE_DCACHE_LOCK
- spin_lock(&dcache_lock);
-# else
- spin_lock(&ip->i_lock);
-# endif
+ afs_d_alias_lock(ip);
#if defined(D_ALIAS_IS_HLIST)
# if defined(HLIST_ITERATOR_NO_NODE)
vcp->target_link = ret;
-# ifdef HAVE_DCACHE_LOCK
if (ret) {
- dget_locked(ret);
+ afs_linux_dget(ret);
}
- spin_unlock(&dcache_lock);
-# else
- if (ret) {
- dget(ret);
- }
- spin_unlock(&ip->i_lock);
-# endif
+ afs_d_alias_unlock(ip);
return ret;
}
* AFS Linux dentry operations
**********************************************************************/
-/* fix_bad_parent() : called 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. fix_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.
- * credp - credentials
- * vcp, pvc - item's and parent's vcache pointer
- * 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
-fix_bad_parent(struct dentry *dp, cred_t *credp, struct vcache *vcp, struct vcache *pvc)
-{
- struct vcache *avc = NULL;
-
- /* force a lookup, so vcp->mvid is fixed up */
- afs_lookup(pvc, (char *)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));
-
- 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)
{
- struct vattr vattr;
+ struct vattr *vattr = NULL;
struct vcache *vcp = VTOAFS(dp->d_inode);
cred_t *credp;
int code;
- if (afs_shuttingdown)
+ if (afs_shuttingdown != AFS_RUNNING)
return EIO;
AFS_GLOCK();
-#ifdef notyet
- /* Make this a fast path (no crref), since it's called so often. */
- if (vcp->states & CStatd) {
- struct vcache *pvc = VTOAFS(dp->d_parent->d_inode);
-
- if (*dp->d_name.name != '/' && vcp->mvstat == 2) { /* root vnode */
- if (vcp->mvid->Fid.Volume != pvc->fid.Fid.Volume) { /* bad parent */
- credp = crref();
- AFS_GLOCK();
- fix_bad_parent(dp); /* check and correct mvid */
- AFS_GUNLOCK();
- crfree(credp);
- }
- }
- return 0;
+ code = afs_CreateAttr(&vattr);
+ if (code) {
+ goto out;
}
-#endif
/* This avoids the crref when we don't have to do it. Watch for
* changes in afs_getattr that don't get replicated here!
*/
if (vcp->f.states & CStatd &&
- (!afs_fakestat_enable || vcp->mvstat != 1) &&
+ (!afs_fakestat_enable || vcp->mvstat != AFS_MVSTAT_MTPT) &&
!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);
}
+#if defined(IOP_GETATTR_TAKES_PATH_STRUCT)
+static int
+afs_linux_getattr(const struct path *path, struct kstat *stat, u32 request_mask, unsigned int sync_mode)
+{
+ int err = afs_linux_revalidate(path->dentry);
+ if (!err) {
+ generic_fillattr(path->dentry->d_inode, stat);
+ }
+ return err;
+}
+#else
static int
afs_linux_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
{
int err = afs_linux_revalidate(dentry);
if (!err) {
generic_fillattr(dentry->d_inode, stat);
+ }
+ return err;
+}
+#endif
+
+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 == AFS_MVSTAT_MTPT && 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);
+}
+
+#ifndef D_SPLICE_ALIAS_RACE
+
+static inline void dentry_race_lock(void) {}
+static inline void dentry_race_unlock(void) {}
+
+#else
+
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+static DEFINE_MUTEX(dentry_race_sem);
+# else
+static DECLARE_MUTEX(dentry_race_sem);
+# endif
+
+static inline void
+dentry_race_lock(void)
+{
+ mutex_lock(&dentry_race_sem);
}
- return err;
+static inline void
+dentry_race_unlock(void)
+{
+ mutex_unlock(&dentry_race_sem);
}
+/* Leave some trace that this code is enabled; otherwise it's pretty hard to
+ * tell. */
+static __attribute__((used)) const char dentry_race_marker[] = "d_splice_alias race workaround enabled";
+
+static int
+check_dentry_race(struct dentry *dp)
+{
+ int raced = 0;
+ if (!dp->d_inode) {
+ /* In Linux, before commit 4919c5e45a91b5db5a41695fe0357fbdff0d5767,
+ * d_splice_alias can momentarily hash a dentry before it's fully
+ * populated. This only happens for a moment, since it's unhashed again
+ * right after (in d_move), but this can make the dentry be found by
+ * __d_lookup, and then given to us.
+ *
+ * So check if the dentry is unhashed; if it is, then the dentry is not
+ * valid. We lock dentry_race_lock() to ensure that d_splice_alias is
+ * no longer running. Locking d_lock is required to check the dentry's
+ * flags, so lock that, too.
+ */
+ dentry_race_lock();
+ spin_lock(&dp->d_lock);
+ if (d_unhashed(dp)) {
+ raced = 1;
+ }
+ spin_unlock(&dp->d_lock);
+ dentry_race_unlock();
+ }
+ return raced;
+}
+#endif /* D_SPLICE_ALIAS_RACE */
+
/* 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
+ * we are advised to follow the entry if it is a link or to make sure that
* 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..
*
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 */
return -ECHILD;
#endif
+#ifdef D_SPLICE_ALIAS_RACE
+ if (check_dentry_race(dp)) {
+ valid = 0;
+ return valid;
+ }
+#endif
+
+ AFS_GLOCK();
afs_InitFakeStat(&fakestate);
if (dp->d_inode) {
if (vcp == afs_globalVp)
goto good_dentry;
- parent = dget_parent(dp);
- pvcp = VTOAFS(parent->d_inode);
-
- if ((vcp->mvstat == 1) || (vcp->mvstat == 2)) { /* need to lock */
- credp = crref();
- AFS_GLOCK();
- locked = 1;
- }
-
- if (locked && vcp->mvstat == 1) { /* mount point */
- if (vcp->mvid && (vcp->f.states & CMValid)) {
+ if (vcp->mvstat == AFS_MVSTAT_MTPT) {
+ if (vcp->mvid.target_root && (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)) {
+ credp = crref();
+
+ code = afs_CreateReq(&treq, credp);
+ if (code) {
+ 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);
- if ((tryEvalOnly && vcp->mvstat == 1) || code) {
+ code = afs_EvalFakeStat(&vcp, &fakestate, treq);
+ afs_DestroyReq(treq);
+ if ((tryEvalOnly && vcp->mvstat == AFS_MVSTAT_MTPT) || code) {
/* a mount point, not yet replaced by its directory */
- dput(parent);
goto bad_dentry;
}
}
- } else
- if (locked && *dp->d_name.name != '/' && vcp->mvstat == 2) { /* root vnode */
- if (vcp->mvid->Fid.Volume != pvcp->f.fid.Fid.Volume) { /* bad parent */
- fix_bad_parent(dp, credp, vcp, pvcp); /* check and correct mvid */
- }
- }
+ } else if (vcp->mvstat == AFS_MVSTAT_ROOT && *dp->d_name.name != '/') {
+ osi_Assert(vcp->mvid.parent != NULL);
+ }
#ifdef notdef
/* If the last looker changes, we should make sure the current
*/
if (vcp->last_looker != treq.uid) {
if (!afs_AccessOK(vcp, (vType(vcp) == VREG) ? PRSFS_READ : PRSFS_LOOKUP, &treq, CHECK_MODE_BITS)) {
- dput(parent);
goto bad_dentry;
}
}
#endif
+ parent = dget_parent(dp);
+ pvcp = VTOAFS(parent->d_inode);
+ 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)) ) {
- credp = crref();
- AFS_GLOCK();
- locked = 1;
- }
+ if (parent_dv > dp->d_time || !(vcp->f.states & CStatd)) {
+ struct vattr *vattr = NULL;
+ int code;
+ int lookup_good;
+
+ if (credp == NULL) {
+ credp = crref();
+ }
+ code = afs_lookup(pvcp, (char *)dp->d_name.name, &tvc, credp);
+
+ if (code) {
+ /* We couldn't perform the lookup, so we're not okay. */
+ lookup_good = 0;
+
+ } else if (tvc == vcp) {
+ /* We got back the same vcache, so we're good. */
+ lookup_good = 1;
+
+ } else if (tvc == VTOAFS(dp->d_inode)) {
+ /* We got back the same vcache, so we're good. This is
+ * different from the above case, because sometimes 'vcp' is
+ * not the same as the vcache for dp->d_inode, if 'vcp' was a
+ * mtpt and we evaluated it to a root dir. In rare cases,
+ * afs_lookup might not evalute the mtpt when we do, or vice
+ * versa, so the previous case will not succeed. But this is
+ * still 'correct', so make sure not to mark the dentry as
+ * invalid; it still points to the same thing! */
+ lookup_good = 1;
+
+ } else {
+ /* We got back a different file, so we're definitely not
+ * okay. */
+ lookup_good = 0;
+ }
- 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 (!tvc || tvc != vcp) {
+ if (!lookup_good) {
+ dput(parent);
+ /* Force unhash; the name doesn't point to this file
+ * anymore. */
+ force_drop = 1;
+ if (code && code != ENOENT) {
+ /* ...except if we couldn't perform the actual lookup,
+ * we don't know if the name points to this file or not. */
+ force_drop = 0;
+ }
+ 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? */
/* unlikely--the vcache entry hasn't changed */
dput(parent);
+
} else {
-#ifdef notyet
- /* If this code is ever enabled, we should use dget_parent to handle
- * getting the parent, and dput() to dispose of it. See above for an
- * example ... */
- pvcp = VTOAFS(dp->d_parent->d_inode);
- if (hgetlo(pvcp->f.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.
- */
+ /* 'dp' represents a cached negative lookup. */
+
+ parent = dget_parent(dp);
+ pvcp = VTOAFS(parent->d_inode);
+ parent_dv = parent_vcache_dv(parent->d_inode, credp);
- goto bad_dentry;
+ if (parent_dv > dp->d_time || !(pvcp->f.states & CStatd)
+ || afs_IsDynroot(pvcp)) {
+ dput(parent);
+ goto bad_dentry;
+ }
+
+ dput(parent);
}
good_dentry:
valid = 1;
+ goto done;
+
+ bad_dentry:
+ valid = 0;
+#ifndef D_INVALIDATE_IS_VOID
+ /* When (v3.18) d_invalidate was converted to void, it also started
+ * being called automatically from revalidate, and automatically
+ * handled:
+ * - shrink_dcache_parent
+ * - automatic detach of submounts
+ * - d_drop
+ * Therefore, after that point, OpenAFS revalidate logic no longer needs
+ * to do any of those things itself for invalid dentry structs. We only need
+ * to tell VFS it's invalid (by returning 0), and VFS will handle the rest.
+ */
+ if (have_submounts(dp))
+ valid = 1;
+#endif
done:
/* Clean up */
if (tvc)
afs_PutVCache(tvc);
- afs_PutFakeStat(&fakestate); /* from here on vcp may be no longer valid */
- if (locked) {
- /* we hold the global lock if we evaluated a mount point */
- AFS_GUNLOCK();
- }
+ afs_PutFakeStat(&fakestate);
+ AFS_GUNLOCK();
if (credp)
crfree(credp);
+#ifndef D_INVALIDATE_IS_VOID
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);
}
+#endif
return valid;
- bad_dentry:
- if (have_submounts(dp))
- valid = 1;
- else
- valid = 0;
- goto done;
}
static void
{
struct dentry *target;
- /* avoid symlink resolution limits when resolving; we cannot contribute to
- * an infinite symlink loop */
+ /*
+ * Avoid symlink resolution limits when resolving; we cannot contribute to
+ * an infinite symlink loop.
+ *
+ * On newer kernels the field has moved to the private nameidata structure
+ * so we can't adjust it here. This may cause ELOOP when using a path with
+ * 40 or more directories that are not already in the dentry cache.
+ */
+#if defined(STRUCT_TASK_STRUCT_HAS_TOTAL_LINK_COUNT)
current->total_link_count--;
+#endif
target = canonical_dentry(path->dentry->d_inode);
afs_linux_create(struct inode *dip, struct dentry *dp, int mode)
#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);
int code;
AFS_GLOCK();
+
code = afs_lookup(VTOAFS(dip), (char *)comp, &vcp, credp);
-
+ if (code == ENOENT) {
+ /* 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 (set by d_splice_alias or
+ * d_add, below). */
+ code = 0;
+ osi_Assert(vcp == NULL);
+ }
+ if (code) {
+ AFS_GUNLOCK();
+ goto done;
+ }
+
if (vcp) {
- struct vattr vattr;
+ struct vattr *vattr = NULL;
struct vcache *parent_vc = VTOAFS(dip);
if (parent_vc == vcp) {
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)) {
d_prune_aliases(ip);
#ifdef STRUCT_DENTRY_OPERATIONS_HAS_D_AUTOMOUNT
- ip->i_flags |= S_AUTOMOUNT;
+ /* Only needed if this is a volume root */
+ if (vcp->mvstat == 2)
+ ip->i_flags |= S_AUTOMOUNT;
#endif
}
+ /*
+ * Take an extra reference so the inode doesn't go away if
+ * d_splice_alias drops our reference on error.
+ */
+ if (ip)
+#ifdef HAVE_LINUX_IHOLD
+ ihold(ip);
+#else
+ igrab(ip);
+#endif
+
+ dentry_race_lock();
newdp = d_splice_alias(ip, dp);
+ dentry_race_unlock();
done:
crfree(credp);
- /* 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 (!code || code == ENOENT)
- return newdp;
- else
+ if (IS_ERR(newdp)) {
+ /* d_splice_alias can return an error (EIO) if there is an existing
+ * connected directory alias for this dentry. Add our dentry manually
+ * ourselves if this happens. */
+ d_add(dp, ip);
+
+#if defined(D_SPLICE_ALIAS_LEAK_ON_ERROR)
+ /* Depending on the kernel version, d_splice_alias may or may not drop
+ * the inode reference on error. If it didn't, do it here. */
+ iput(ip);
+#endif
+ return NULL;
+ }
+
+ if (code) {
+ if (ip)
+ iput(ip);
return ERR_PTR(afs_convert_code(code));
+ }
+
+ iput(ip);
+ return newdp;
}
static int
VTOAFS(dir), (char *)__dp->d_name.name,
credp);
if (!code) {
- tvc->mvid = (void *) __name;
+ tvc->mvid.silly_name = __name;
crhold(credp);
if (tvc->uncred) {
crfree(tvc->uncred);
tvc->uncred = credp;
tvc->f.states |= CUnlinked;
afs_linux_set_nfsfs_renamed(dentry);
+
+ __dp->d_time = 0; /* force to revalidate */
+ d_move(dentry, __dp);
} else {
osi_FreeSmallSpace(__name);
}
AFS_GUNLOCK();
- if (!code) {
- __dp->d_time = hgetlo(VTOAFS(dir)->f.m.DataVersion);
- d_move(dentry, __dp);
- }
dput(__dp);
return code;
{
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;
#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);
static int
afs_linux_rename(struct inode *oldip, struct dentry *olddp,
- struct inode *newip, struct dentry *newdp)
+ struct inode *newip, struct dentry *newdp
+#ifdef HAVE_LINUX_INODE_OPERATIONS_RENAME_TAKES_FLAGS
+ , unsigned int flags
+#endif
+ )
{
int code;
cred_t *credp = crref();
const char *newname = newdp->d_name.name;
struct dentry *rehash = NULL;
+#ifdef HAVE_LINUX_INODE_OPERATIONS_RENAME_TAKES_FLAGS
+ if (flags)
+ return -EINVAL; /* no support for new flags yet */
+#endif
+
/* Prevent any new references during rename operation. */
if (!d_unhashed(newdp)) {
}
-/* afs_linux_ireadlink
+/* afs_linux_ireadlink
* Internal readlink which can return link contents to user or kernel space.
* Note that the buffer is NOT supposed to be null-terminated.
*/
struct uio tuio;
struct iovec iov;
+ memset(&tuio, 0, sizeof(tuio));
+ memset(&iov, 0, sizeof(iov));
+
setup_uio(&tuio, &iov, target, (afs_offs_t) 0, maxlen, UIO_READ, seg);
code = afs_readlink(VTOAFS(ip), &tuio, credp);
crfree(credp);
}
#if !defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
-/* afs_linux_readlink
+/* afs_linux_readlink
* Fill target (which is in user space) with contents of symlink.
*/
static int
/* afs_linux_follow_link
* a file system dependent link following routine.
*/
+#if defined(HAVE_LINUX_INODE_OPERATIONS_FOLLOW_LINK_NO_NAMEIDATA)
+static const char *afs_linux_follow_link(struct dentry *dentry, void **link_data)
+#else
static int afs_linux_follow_link(struct dentry *dentry, struct nameidata *nd)
+#endif
{
int code;
char *name;
name = kmalloc(PATH_MAX, GFP_NOFS);
if (!name) {
+#if defined(HAVE_LINUX_INODE_OPERATIONS_FOLLOW_LINK_NO_NAMEIDATA)
+ return ERR_PTR(-EIO);
+#else
return -EIO;
+#endif
}
AFS_GLOCK();
AFS_GUNLOCK();
if (code < 0) {
+#if defined(HAVE_LINUX_INODE_OPERATIONS_FOLLOW_LINK_NO_NAMEIDATA)
+ return ERR_PTR(code);
+#else
return code;
+#endif
}
name[code] = '\0';
+#if defined(HAVE_LINUX_INODE_OPERATIONS_FOLLOW_LINK_NO_NAMEIDATA)
+ return *link_data = name;
+#else
nd_set_link(nd, name);
return 0;
+#endif
}
+#if defined(HAVE_LINUX_INODE_OPERATIONS_PUT_LINK_NO_NAMEIDATA)
+static void
+afs_linux_put_link(struct inode *inode, void *link_data)
+{
+ char *name = link_data;
+
+ if (name && !IS_ERR(name))
+ kfree(name);
+}
+#else
static void
afs_linux_put_link(struct dentry *dentry, struct nameidata *nd)
{
if (name && !IS_ERR(name))
kfree(name);
}
+#endif /* HAVE_LINUX_INODE_OPERATIONS_PUT_LINK_NO_NAMEIDATA */
#endif /* USABLE_KERNEL_PAGE_SYMLINK_CACHE */
/* If we're trying to read a page that's past the end of the disk
* cache file, then just return a zeroed page */
if (AFS_CHUNKOFFSET(offset) >= i_size_read(cacheinode)) {
- zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+ zero_user_segment(page, 0, PAGE_SIZE);
SetPageUptodate(page);
if (task)
unlock_page(page);
/* From our offset, we now need to work out which page in the disk
* file it corresponds to. This will be fun ... */
- pageindex = (offset - AFS_CHUNKTOBASE(chunk)) >> PAGE_CACHE_SHIFT;
+ pageindex = (offset - AFS_CHUNKTOBASE(chunk)) >> PAGE_SHIFT;
while (cachepage == NULL) {
cachepage = find_get_page(cachemapping, pageindex);
if (!cachepage) {
if (!newpage)
- newpage = page_cache_alloc_cold(cachemapping);
+ newpage = page_cache_alloc(cachemapping);
if (!newpage) {
code = -ENOMEM;
goto out;
cachepage = newpage;
newpage = NULL;
- page_cache_get(cachepage);
+ get_page(cachepage);
if (!pagevec_add(lrupv, cachepage))
__pagevec_lru_add_file(lrupv);
} else {
- page_cache_release(newpage);
+ put_page(newpage);
newpage = NULL;
if (code != -EEXIST)
goto out;
out:
if (cachepage)
- page_cache_release(cachepage);
+ put_page(cachepage);
return code;
}
/* XXX - I suspect we should be locking the inodes before we use them! */
AFS_GUNLOCK();
cacheFp = afs_linux_raw_open(&tdc->f.inode);
+ osi_Assert(cacheFp);
if (!cacheFp->f_dentry->d_inode->i_mapping->a_ops->readpage) {
cachefs_noreadpage = 1;
AFS_GLOCK();
goto out;
}
+#if defined(PAGEVEC_INIT_COLD_ARG)
pagevec_init(&lrupv, 0);
+#else
+ pagevec_init(&lrupv);
+#endif
code = afs_linux_read_cache(cacheFp, pp, tdc->f.chunk, &lrupv, NULL);
99999); /* not a possible code value */
code = afs_rdwr(avc, auio, UIO_READ, 0, credp);
-
+
afs_Trace4(afs_iclSetp, CM_TRACE_READPAGE, ICL_TYPE_POINTER, ip,
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, cnt, ICL_TYPE_INT32,
code);
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_PutDCache(tdc);
+ afs_PrefetchChunk(avc, tdc, credp, treq);
+ afs_PutDCache(tdc);
}
ReleaseWriteLock(&avc->lock);
}
+ afs_DestroyReq(treq);
AFS_GUNLOCK();
crfree(credp);
}
ancr->offset = auio->uio_offset;
ancr->length = auio->uio_resid;
+#if defined(PAGEVEC_INIT_COLD_ARG)
pagevec_init(&lrupv, 0);
+#else
+ pagevec_init(&lrupv);
+#endif
for(page_ix = 0; page_ix < num_pages; ++page_ix) {
/* If we allocate a page and don't remove it from page_list,
* the page cache gets upset. */
list_del(&pp->lru);
- isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT;
+ isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_SHIFT;
if(pp->index > isize) {
if(PageLocked(pp))
unlock_page(pp);
if(base_index != pp->index) {
if(PageLocked(pp))
unlock_page(pp);
- page_cache_release(pp);
+ put_page(pp);
iovecp[page_ix].iov_base = (void *) 0;
base_index++;
ancr->length -= PAGE_SIZE;
if(code) {
if(PageLocked(pp))
unlock_page(pp);
- page_cache_release(pp);
+ put_page(pp);
iovecp[page_ix].iov_base = (void *) 0;
} else {
page_count++;
* it as up to date.
*/
if (page_offset(pp) >= i_size_read(fp->f_mapping->host)) {
- zero_user_segment(pp, 0, PAGE_CACHE_SIZE);
+ zero_user_segment(pp, 0, PAGE_SIZE);
SetPageUptodate(pp);
unlock_page(pp);
return 0;
task = afs_pagecopy_init_task();
tdc = NULL;
+#if defined(PAGEVEC_INIT_COLD_ARG)
pagevec_init(&lrupv, 0);
+#else
+ pagevec_init(&lrupv);
+#endif
for (page_idx = 0; page_idx < num_pages; page_idx++) {
struct page *page = list_entry(page_list->prev, struct page, lru);
list_del(&page->lru);
AFS_GUNLOCK();
if (tdc) {
cacheFp = afs_linux_raw_open(&tdc->f.inode);
+ osi_Assert(cacheFp);
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,
GFP_KERNEL)) {
- page_cache_get(page);
+ get_page(page);
if (!pagevec_add(&lrupv, page))
__pagevec_lru_add_file(&lrupv);
afs_linux_read_cache(cacheFp, page, tdc->f.chunk, &lrupv, task);
}
- page_cache_release(page);
+ put_page(page);
}
if (pagevec_count(&lrupv))
__pagevec_lru_add_file(&lrupv);
* locked */
static inline int
afs_linux_prepare_writeback(struct vcache *avc) {
- if (avc->f.states & CPageWrite) {
- return AOP_WRITEPAGE_ACTIVATE;
+ pid_t pid;
+ struct pagewriter *pw;
+
+ pid = MyPidxx2Pid(MyPidxx);
+ /* Prevent recursion into the writeback code */
+ spin_lock(&avc->pagewriter_lock);
+ list_for_each_entry(pw, &avc->pagewriters, link) {
+ if (pw->writer == pid) {
+ spin_unlock(&avc->pagewriter_lock);
+ return AOP_WRITEPAGE_ACTIVATE;
+ }
}
- avc->f.states |= CPageWrite;
+ spin_unlock(&avc->pagewriter_lock);
+
+ /* Add ourselves to writer list */
+ pw = osi_Alloc(sizeof(struct pagewriter));
+ pw->writer = pid;
+ spin_lock(&avc->pagewriter_lock);
+ list_add_tail(&pw->link, &avc->pagewriters);
+ spin_unlock(&avc->pagewriter_lock);
+
return 0;
}
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);
}
static inline void
afs_linux_complete_writeback(struct vcache *avc) {
- avc->f.states &= ~CPageWrite;
+ struct pagewriter *pw, *store;
+ pid_t pid;
+ struct list_head tofree;
+
+ INIT_LIST_HEAD(&tofree);
+ pid = MyPidxx2Pid(MyPidxx);
+ /* Remove ourselves from writer list */
+ spin_lock(&avc->pagewriter_lock);
+ list_for_each_entry_safe(pw, store, &avc->pagewriters, link) {
+ if (pw->writer == pid) {
+ list_del(&pw->link);
+ /* osi_Free may sleep so we need to defer it */
+ list_add_tail(&pw->link, &tofree);
+ }
+ }
+ spin_unlock(&avc->pagewriter_lock);
+ list_for_each_entry_safe(pw, store, &tofree, link) {
+ list_del(&pw->link);
+ osi_Free(pw, sizeof(struct pagewriter));
+ }
}
/* Writeback a given page syncronously. Called with no AFS locks held */
struct iovec iovec;
int f_flags = 0;
+ memset(&tuio, 0, sizeof(tuio));
+ memset(&iovec, 0, sizeof(iovec));
+
buffer = kmap(pp) + offset;
base = page_offset(pp) + offset;
struct inode *inode;
struct vcache *vcp;
cred_t *credp;
- unsigned int to = PAGE_CACHE_SIZE;
+ unsigned int to = PAGE_SIZE;
loff_t isize;
int code = 0;
int code1 = 0;
- if (PageReclaim(pp)) {
- return AOP_WRITEPAGE_ACTIVATE;
- /* XXX - Do we need to redirty the page here? */
- }
-
- page_cache_get(pp);
+ get_page(pp);
inode = mapping->host;
vcp = VTOAFS(inode);
done:
end_page_writeback(pp);
- page_cache_release(pp);
+ put_page(pp);
if (code1)
return code1;
/* Is the location we are writing to beyond the end of the file? */
if (pagebase >= isize ||
((from == 0) && (pagebase + to) >= isize)) {
- zero_user_segments(page, 0, from, to, PAGE_CACHE_SIZE);
+ zero_user_segments(page, 0, from, to, PAGE_SIZE);
SetPageChecked(page);
/* Are we we writing a full page */
- } else if (from == 0 && to == PAGE_CACHE_SIZE) {
+ } else if (from == 0 && to == PAGE_SIZE) {
SetPageChecked(page);
/* Is the page readable, if it's wronly, we don't care, because we're
* not actually going to read from it ... */
struct page *page, void *fsdata)
{
int code;
- unsigned int from = pos & (PAGE_CACHE_SIZE - 1);
+ unsigned int from = pos & (PAGE_SIZE - 1);
- code = afs_linux_commit_write(file, page, from, from + len);
+ code = afs_linux_commit_write(file, page, from, from + copied);
unlock_page(page);
- page_cache_release(page);
+ put_page(page);
return code;
}
struct page **pagep, void **fsdata)
{
struct page *page;
- pgoff_t index = pos >> PAGE_CACHE_SHIFT;
- unsigned int from = pos & (PAGE_CACHE_SIZE - 1);
+ pgoff_t index = pos >> PAGE_SHIFT;
+ unsigned int from = pos & (PAGE_SIZE - 1);
int code;
page = grab_cache_page_write_begin(mapping, index, flags);
code = afs_linux_prepare_write(file, page, from, from + len);
if (code) {
unlock_page(page);
- page_cache_release(page);
+ put_page(page);
}
return code;
static struct inode_operations afs_symlink_iops = {
#if defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
.readlink = page_readlink,
-# if defined(HAVE_LINUX_PAGE_FOLLOW_LINK)
+# if defined(HAVE_LINUX_PAGE_GET_LINK)
+ .get_link = page_get_link,
+# elif defined(HAVE_LINUX_PAGE_FOLLOW_LINK)
.follow_link = page_follow_link,
# else
.follow_link = page_follow_link_light,
void
afs_fill_inode(struct inode *ip, struct vattr *vattr)
{
-
if (vattr)
vattr2inode(ip, vattr);
+#ifdef STRUCT_ADDRESS_SPACE_HAS_BACKING_DEV_INFO
ip->i_mapping->backing_dev_info = afs_backing_dev_info;
+#endif
/* Reset ops if symlink or directory. */
if (S_ISREG(ip->i_mode)) {
ip->i_op = &afs_file_iops;
} else if (S_ISLNK(ip->i_mode)) {
ip->i_op = &afs_symlink_iops;
+#if defined(HAVE_LINUX_INODE_NOHIGHMEM)
+ inode_nohighmem(ip);
+#endif
#if defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
ip->i_data.a_ops = &afs_symlink_aops;
ip->i_mapping = &ip->i_data;
git://git.openafs.org / openafs.git / blobdiff