/*
* 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.
*/
}
#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
struct dcache *tdc;
int code;
int offset;
- int dirpos;
+ afs_int32 dirpos;
struct DirEntry *de;
struct DirBuffer entry;
ino_t ino;
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);
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);
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.
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;
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);
#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
cred_t *credp;
int code;
- if (afs_shuttingdown)
+ if (afs_shuttingdown != AFS_RUNNING)
return EIO;
AFS_GLOCK();
* 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);
}
static afs_uint32
-parent_vcache_dv(struct inode *inode, cred_t *credp)
+parent_vcache_dv(struct inode *inode, cred_t *credp, int locked)
{
int free_cred = 0;
struct vcache *pvcp;
* us. The fake entry is the one with the useful DataVersion.
*/
pvcp = VTOAFS(inode);
- if (pvcp->mvstat == 1 && afs_fakestat_enable) {
+ if (pvcp->mvstat == AFS_MVSTAT_MTPT && afs_fakestat_enable) {
struct vrequest treq;
struct afs_fakestat_state fakestate;
+ if (!locked) {
+ AFS_GLOCK();
+ }
if (!credp) {
credp = crref();
free_cred = 1;
if (free_cred)
crfree(credp);
afs_PutFakeStat(&fakestate);
+ if (!locked) {
+ AFS_GUNLOCK();
+ }
}
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
- * 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..
*
parent = dget_parent(dp);
pvcp = VTOAFS(parent->d_inode);
- if ((vcp->mvstat == 1) || (vcp->mvstat == 2) ||
- (pvcp->mvstat == 1 && afs_fakestat_enable)) { /* need to lock */
+ if ((vcp->mvstat != AFS_MVSTAT_FILE) ||
+ (pvcp->mvstat == AFS_MVSTAT_MTPT && afs_fakestat_enable)) { /* need to lock */
credp = crref();
AFS_GLOCK();
locked = 1;
}
if (locked) {
- if (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 = NULL;
else
code = afs_EvalFakeStat(&vcp, &fakestate, treq);
afs_DestroyReq(treq);
- if ((tryEvalOnly && vcp->mvstat == 1) || code) {
+ if ((tryEvalOnly && vcp->mvstat == AFS_MVSTAT_MTPT) || code) {
/* a mount point, not yet replaced by its directory */
dput(parent);
goto bad_dentry;
}
}
- } else if (vcp->mvstat == 2 && *dp->d_name.name != '/') {
- osi_Assert(vcp->mvid != NULL);
+ } else if (vcp->mvstat == AFS_MVSTAT_ROOT && *dp->d_name.name != '/') {
+ osi_Assert(vcp->mvid.parent != NULL);
}
}
}
#endif
- parent_dv = parent_vcache_dv(parent->d_inode, credp);
+ parent_dv = parent_vcache_dv(parent->d_inode, credp, locked);
/* If the parent's DataVersion has changed or the vnode
* is longer valid, we need to do a full lookup. VerifyVCache
/* 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, locked);
- 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:
bad_dentry:
if (have_submounts(dp))
valid = 1;
- else
+ else
valid = 0;
goto done;
}
{
struct dentry *target;
- /*
+ /*
* Avoid symlink resolution limits when resolving; we cannot contribute to
* an infinite symlink loop.
*
#if !defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
dp->d_op = &afs_dentry_operations;
#endif
- dp->d_time = parent_vcache_dv(dip, credp);
+ dp->d_time = parent_vcache_dv(dip, credp, 1);
d_instantiate(dp, ip);
}
AFS_GLOCK();
code = afs_lookup(VTOAFS(dip), (char *)comp, &vcp, credp);
-
+
if (!code) {
struct vattr *vattr = NULL;
struct vcache *parent_vc = VTOAFS(dip);
#if !defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
dp->d_op = &afs_dentry_operations;
#endif
- dp->d_time = parent_vcache_dv(dip, credp);
+ dp->d_time = parent_vcache_dv(dip, credp, 1);
AFS_GUNLOCK();
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
}
/*
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;
#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, 1);
d_instantiate(dp, ip);
}
afs_DestroyAttr(vattr);
}
-/* 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.
*/
}
#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 */
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 (tdc) {
if (!(tdc->mflags & DFNextStarted))
afs_PrefetchChunk(avc, tdc, credp, treq);
- afs_PutDCache(tdc);
+ afs_PutDCache(tdc);
}
ReleaseWriteLock(&avc->lock);
}
void
afs_fill_inode(struct inode *ip, struct vattr *vattr)
{
-
if (vattr)
vattr2inode(ip, vattr);
git://git.openafs.org / openafs.git / blobdiff