#if defined(AFS_LINUX26_ENV)
#define LockPage(pp) lock_page(pp)
#define UnlockPage(pp) unlock_page(pp)
+extern struct backing_dev_info afs_backing_dev_info;
#endif
extern struct vcache *afs_globalVp;
+extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp);
#if defined(AFS_LINUX26_ENV)
/* Some uses of BKL are perhaps not needed for bypass or memcache--
* why don't we try it out? */
if (code)
code = -code;
else {
- isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT;
+#if defined(AFS_CACHE_BYPASS)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT;
offindex = *offp >> PAGE_CACHE_SHIFT;
if(offindex > isize) {
code=0;
goto done;
}
-
- osi_FlushPages(vcp, credp); /* ensure stale pages are gone */
- AFS_GUNLOCK();
+#endif
+#endif
+ osi_FlushPages(vcp, credp); /* ensure stale pages are gone */
+ AFS_GUNLOCK();
#ifdef DO_SYNC_READ
- code = do_sync_read(fp, buf, count, offp);
+ code = do_sync_read(fp, buf, count, offp);
#else
- code = generic_file_read(fp, buf, count, offp);
+ code = generic_file_read(fp, buf, count, offp);
#endif
- AFS_GLOCK();
+ AFS_GLOCK();
}
afs_Trace4(afs_iclSetp, CM_TRACE_READOP, ICL_TYPE_POINTER, vcp,
credp = crref();
code = afs_getattr(vcp, &vattr, credp);
if (!code)
- vattr2inode(AFSTOV(vcp), &vattr);
+ afs_fill_inode(AFSTOV(vcp), &vattr);
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
cred_t *credp = NULL;
struct vcache *vcp, *pvcp, *tvc = NULL;
int valid;
+ struct afs_fakestat_state fakestate;
#ifdef AFS_LINUX24_ENV
maybe_lock_kernel();
#endif
AFS_GLOCK();
+ afs_InitFakeStat(&fakestate);
if (dp->d_inode) {
if (vcp->mvstat == 1) { /* mount point */
if (vcp->mvid && (vcp->states & CMValid)) {
- /* a mount point, not yet replaced by its directory */
- goto bad_dentry;
+ int tryEvalOnly = 0;
+ int code = 0;
+ struct vrequest treq;
+
+ credp = crref();
+ code = afs_InitReq(&treq, credp);
+ if (
+#ifdef AFS_DARWIN_ENV
+ (strcmp(dp->d_name.name, ".DS_Store") == 0) ||
+ (strcmp(dp->d_name.name, "Contents") == 0) ||
+#endif
+ (strcmp(dp->d_name.name, ".directory") == 0)) {
+ tryEvalOnly = 1;
+ }
+ if (tryEvalOnly)
+ code = afs_TryEvalFakeStat(&vcp, &fakestate, &treq);
+ else
+ code = afs_EvalFakeStat(&vcp, &fakestate, &treq);
+ if ((tryEvalOnly && vcp->mvstat == 1) || code) {
+ /* a mount point, not yet replaced by its directory */
+ goto bad_dentry;
+ }
}
} else
if (*dp->d_name.name != '/' && vcp->mvstat == 2) /* root vnode */
/* Clean up */
if (tvc)
afs_PutVCache(tvc);
+ afs_PutFakeStat(&fakestate);
AFS_GUNLOCK();
if (credp)
crfree(credp);
return valid;
bad_dentry:
- valid = 0;
+ if (have_submounts(dp))
+ valid = 1;
+ else
+ valid = 0;
goto done;
}
set_bit(PG_locked, &pp->flags); /* other bits? See mm.h */
clear_bit(PG_error, &pp->flags);
#endif
+#if defined(AFS_CACHE_BYPASS)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
/* If the page is past the end of the file, skip it */
isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT;
if(pp->index > isize) {
UnlockPage(pp);
goto done;
}
+#endif
+#endif
/* if bypasscache, receiver frees, else we do */
auio = osi_Alloc(sizeof(uio_t));
iovecp = osi_Alloc(sizeof(struct iovec));
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
ICL_TYPE_INT32, 99999);
+ ObtainReadLock(&vcp->lock);
+ if (vcp->states & CPageWrite) {
+ ReleaseReadLock(&vcp->lock);
+ AFS_GUNLOCK();
+ maybe_unlock_kernel();
+ crfree(credp);
+ kunmap(pp);
+#ifdef AFS_LINUX26_ENV
+#if defined(WRITEPAGE_ACTIVATE)
+ return WRITEPAGE_ACTIVATE;
+#else
+ return AOP_WRITEPAGE_ACTIVATE;
+#endif
+#else
+ /* should mark it dirty? */
+ return(0);
+#endif
+ }
+ ReleaseReadLock(&vcp->lock);
+
setup_uio(&tuio, &iovec, buffer, base, count, UIO_WRITE, AFS_UIOSYS);
code = afs_write(vcp, &tuio, f_flags, credp, 0);
return -code;
}
-#if defined(AFS_LINUX24_ENV)
+#if defined(AFS_LINUX24_ENV) && !defined(HAVE_WRITE_BEGIN)
static int
afs_linux_commit_write(struct file *file, struct page *page, unsigned offset,
unsigned to)
#endif
return 0;
}
+#endif
-extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp);
+#if defined(HAVE_WRITE_BEGIN)
+static int
+afs_linux_write_end(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned copied,
+ struct page *page, void *fsdata)
+{
+ int code;
+ pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+ unsigned from = pos & (PAGE_CACHE_SIZE - 1);
+
+ code = afs_linux_writepage_sync(file->f_dentry->d_inode, page,
+ from, copied);
+ unlock_page(page);
+ page_cache_release(page);
+ return code;
+}
+
+static int
+afs_linux_write_begin(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata)
+{
+ struct page *page;
+ pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+ page = __grab_cache_page(mapping, index);
+ *pagep = page;
+
+ return 0;
+}
#endif
+
static struct inode_operations afs_file_iops = {
#if defined(AFS_LINUX26_ENV)
.permission = afs_linux_permission,
.readpages = afs_linux_readpages,
#endif
.writepage = afs_linux_writepage,
- .commit_write = afs_linux_commit_write,
- .prepare_write = afs_linux_prepare_write,
+#if defined (HAVE_WRITE_BEGIN)
+ .write_begin = afs_linux_write_begin,
+ .write_end = afs_linux_write_end,
+#else
+ .commit_write = afs_linux_commit_write,
+ .prepare_write = afs_linux_prepare_write,
+#endif
};
#endif
if (vattr)
vattr2inode(ip, vattr);
+ ip->i_mapping->backing_dev_info = &afs_backing_dev_info;
/* 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