extern struct vcache *afs_globalVp;
extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp);
-#if defined(AFS_LINUX26_ENV)
+#if defined(AFS_LINUX24_ENV)
/* Some uses of BKL are perhaps not needed for bypass or memcache--
* why don't we try it out? */
extern struct afs_cacheOps afs_UfsCacheOps;
if(afs_cacheType == &afs_UfsCacheOps) \
unlock_kernel(); \
} while(0);
-#endif /* AFS_CACHE_BYPASS */
+#endif /* AFS_LINUX24_ENV */
static ssize_t
afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp)
* 1. The cache data is being fetched by another process.
* 2. The cache data is no longer valid
*/
- while ((avc->states & CStatd)
+ while ((avc->f.states & CStatd)
&& (tdc->dflags & DFFetching)
- && hsame(avc->m.DataVersion, tdc->f.versionNo)) {
+ && hsame(avc->f.m.DataVersion, tdc->f.versionNo)) {
ReleaseReadLock(&tdc->lock);
ReleaseSharedLock(&avc->lock);
afs_osi_Sleep(&tdc->validPos);
ObtainSharedLock(&avc->lock, 812);
ObtainReadLock(&tdc->lock);
}
- if (!(avc->states & CStatd)
- || !hsame(avc->m.DataVersion, tdc->f.versionNo)) {
+ if (!(avc->f.states & CStatd)
+ || !hsame(avc->f.m.DataVersion, tdc->f.versionNo)) {
ReleaseReadLock(&tdc->lock);
ReleaseSharedLock(&avc->lock);
afs_PutDCache(tdc);
/* Set the readdir-in-progress flag, and downgrade the lock
* to shared so others will be able to acquire a read lock.
*/
- avc->states |= CReadDir;
+ avc->f.states |= CReadDir;
avc->dcreaddir = tdc;
avc->readdir_pid = MyPidxx;
ConvertWToSLock(&avc->lock);
if (!de)
break;
- ino = afs_calc_inum (avc->fid.Fid.Volume, ntohl(de->fid.vnode));
+ ino = afs_calc_inum (avc->f.fid.Fid.Volume, ntohl(de->fid.vnode));
if (de->name)
len = strlen(de->name);
struct VenusFid afid;
struct vcache *tvc;
int vtype;
- afid.Cell = avc->fid.Cell;
- afid.Fid.Volume = avc->fid.Fid.Volume;
+ afid.Cell = avc->f.fid.Cell;
+ afid.Fid.Volume = avc->f.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)) {
+ 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) {
type = DT_DIR;
- } else if (((tvc->states) & (CStatd | CTruth))) {
+ } else if (((tvc->f.states) & (CStatd | CTruth))) {
/* CTruth will be set if the object has
*ever* been statd */
vtype = vType(tvc);
ReleaseReadLock(&tdc->lock);
afs_PutDCache(tdc);
UpgradeSToWLock(&avc->lock, 813);
- avc->states &= ~CReadDir;
+ avc->f.states &= ~CReadDir;
avc->dcreaddir = 0;
avc->readdir_pid = 0;
ReleaseSharedLock(&avc->lock);
code = generic_file_mmap(fp, vmap);
AFS_GLOCK();
if (!code)
- vcp->states |= CMAPPED;
+ vcp->f.states |= CMAPPED;
out:
AFS_GUNLOCK();
&treq,
AFS_SYNC | AFS_LASTSTORE);
} else {
-#if defined(AFS_DISCON_ENV)
- if (!vcp->ddirty_flags ||
- (vcp->ddirty_flags == VDisconShadowed)) {
-
- ObtainWriteLock(&afs_DDirtyVCListLock, 710);
- AFS_DISCON_ADD_DIRTY(vcp, 1);
- ReleaseWriteLock(&afs_DDirtyVCListLock);
- }
-
- /* Set disconnected write flag. */
- vcp->ddirty_flags |= VDisconWriteOsiFlush;
-#endif
+ afs_DisconAddDirty(vcp, VDisconWriteOsiFlush, 1);
}
-
ConvertWToSLock(&vcp->lock);
}
code = afs_CheckCode(code, &treq, 54);
struct vcache *vcp = VTOAFS(dp->d_inode), *avc = NULL;
struct vcache *pvc = VTOAFS(dp->d_parent->d_inode);
- if (vcp->mvid->Fid.Volume != pvc->fid.Fid.Volume) { /* bad parent */
+ if (vcp->mvid->Fid.Volume != pvc->f.fid.Fid.Volume) { /* bad parent */
credp = crref();
/* force a lookup, so vcp->mvid is fixed up */
#ifdef notyet
/* Make this a fast path (no crref), since it's called so often. */
- if (vcp->states & CStatd) {
+ if (vcp->f.states & CStatd) {
if (*dp->d_name.name != '/' && vcp->mvstat == 2) /* root vnode */
check_bad_parent(dp); /* check and correct mvid */
goto good_dentry;
if (vcp->mvstat == 1) { /* mount point */
- if (vcp->mvid && (vcp->states & CMValid)) {
+ if (vcp->mvid && (vcp->f.states & CMValid)) {
int tryEvalOnly = 0;
int code = 0;
struct vrequest treq;
* isn't enough since the vnode may have been renamed.
*/
- if (hgetlo(pvcp->m.DataVersion) > dp->d_time || !(vcp->states & CStatd)) {
+ if (hgetlo(pvcp->f.m.DataVersion) > dp->d_time || !(vcp->f.states & CStatd)) {
credp = crref();
afs_lookup(pvcp, dp->d_name.name, &tvc, credp);
goto bad_dentry;
vattr2inode(AFSTOV(vcp), &vattr);
- dp->d_time = hgetlo(pvcp->m.DataVersion);
+ dp->d_time = hgetlo(pvcp->f.m.DataVersion);
}
/* should we always update the attributes at this point? */
} else {
#ifdef notyet
pvcp = VTOAFS(dp->d_parent->d_inode); /* dget_parent()? */
- if (hgetlo(pvcp->m.DataVersion) > dp->d_time)
+ if (hgetlo(pvcp->f.m.DataVersion) > dp->d_time)
goto bad_dentry;
#endif
struct vcache *vcp = VTOAFS(ip);
AFS_GLOCK();
- (void) afs_InactiveVCache(vcp, NULL);
+ if (!AFS_IS_DISCONNECTED || (vcp->f.states & CUnlinked)) {
+ (void) afs_InactiveVCache(vcp, NULL);
+ }
AFS_GUNLOCK();
#ifdef DCACHE_NFSFS_RENAMED
#ifdef AFS_LINUX26_ENV
static int
afs_dentry_delete(struct dentry *dp)
{
- if (dp->d_inode && (VTOAFS(dp->d_inode)->states & CUnlinked))
+ if (dp->d_inode && (VTOAFS(dp->d_inode)->f.states & CUnlinked))
return 1; /* bad inode? */
return 0;
afs_fill_inode(ip, &vattr);
insert_inode_hash(ip);
dp->d_op = &afs_dentry_operations;
- dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
+ dp->d_time = hgetlo(VTOAFS(dip)->f.m.DataVersion);
d_instantiate(dp, ip);
}
AFS_GUNLOCK();
insert_inode_hash(ip);
}
dp->d_op = &afs_dentry_operations;
- dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
+ dp->d_time = hgetlo(VTOAFS(dip)->f.m.DataVersion);
AFS_GUNLOCK();
#if defined(AFS_LINUX24_ENV)
maybe_lock_kernel();
#endif
if (VREFCOUNT(tvc) > 1 && tvc->opens > 0
- && !(tvc->states & CUnlinked)) {
+ && !(tvc->f.states & CUnlinked)) {
struct dentry *__dp;
char *__name;
crfree(tvc->uncred);
}
tvc->uncred = credp;
- tvc->states |= CUnlinked;
+ tvc->f.states |= CUnlinked;
#ifdef DCACHE_NFSFS_RENAMED
#ifdef AFS_LINUX26_ENV
spin_lock(&dp->d_lock);
AFS_GUNLOCK();
if (!code) {
- __dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
+ __dp->d_time = hgetlo(VTOAFS(dip)->f.m.DataVersion);
d_move(dp, __dp);
}
dput(__dp);
afs_fill_inode(ip, &vattr);
dp->d_op = &afs_dentry_operations;
- dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
+ dp->d_time = hgetlo(VTOAFS(dip)->f.m.DataVersion);
d_instantiate(dp, ip);
}
AFS_GUNLOCK();
maybe_lock_kernel();
#endif
AFS_GLOCK();
+ AFS_DISCON_LOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_READPAGE, ICL_TYPE_POINTER, ip, ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, cnt, ICL_TYPE_INT32, 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);
+ AFS_DISCON_UNLOCK();
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
maybe_unlock_kernel();
ICL_TYPE_INT32, 99999);
ObtainReadLock(&vcp->lock);
- if (vcp->states & CPageWrite) {
+ if (vcp->f.states & CPageWrite) {
ReleaseReadLock(&vcp->lock);
AFS_GUNLOCK();
maybe_unlock_kernel();
code = afs_write(vcp, &tuio, f_flags, credp, 0);
- ip->i_size = vcp->m.Length;
- ip->i_blocks = ((vcp->m.Length + 1023) >> 10) << 1;
+ i_size_write(ip, vcp->f.m.Length);
+ ip->i_blocks = ((vcp->f.m.Length + 1023) >> 10) << 1;
if (!code) {
struct vrequest treq;
#endif
inode = (struct inode *)mapping->host;
- end_index = inode->i_size >> PAGE_CACHE_SHIFT;
+ end_index = i_size_read(inode) >> PAGE_CACHE_SHIFT;
/* easy case */
if (pp->index < end_index)
goto do_it;
/* things got complicated... */
- offset = inode->i_size & (PAGE_CACHE_SIZE - 1);
+ offset = i_size_read(inode) & (PAGE_CACHE_SIZE - 1);
/* OK, are we completely out? */
if (pp->index >= end_index + 1 || !offset)
return -EIO;
credp = crref();
AFS_GLOCK();
+ AFS_DISCON_LOCK();
afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
ICL_TYPE_INT32, 99999);
code = afs_write(vcp, &tuio, fp->f_flags, credp, 0);
- ip->i_size = vcp->m.Length;
- ip->i_blocks = ((vcp->m.Length + 1023) >> 10) << 1;
+ i_size_write(ip, vcp->f.m.Length);
+ ip->i_blocks = ((vcp->f.m.Length + 1023) >> 10) << 1;
if (!code) {
struct vrequest treq;
ObtainWriteLock(&vcp->lock, 533);
- vcp->m.Date = osi_Time(); /* set modification time */
+ vcp->f.m.Date = osi_Time(); /* set modification time */
if (!afs_InitReq(&treq, credp))
code = afs_DoPartialWrite(vcp, &treq);
ReleaseWriteLock(&vcp->lock);
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
ICL_TYPE_INT32, code);
+ AFS_DISCON_UNLOCK();
AFS_GUNLOCK();
crfree(credp);
{
struct page *page;
pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+#if defined(HAVE_GRAB_CACHE_PAGE_WRITE_BEGIN)
+ page = grab_cache_page_write_begin(mapping, index, flags);
+#else
page = __grab_cache_page(mapping, index);
+#endif
*pagep = page;
return 0;
if (vattr)
vattr2inode(ip, vattr);
+#if defined(AFS_LINUX26_ENV)
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;
git://git.openafs.org / openafs.git / blobdiff