#define pageoff(pp) pp->offset
#endif
+#ifndef MAX_ERRNO
+#define MAX_ERRNO 1000L
+#endif
+
#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;
-#if defined(AFS_LINUX26_ENV)
+extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp);
+#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)
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,
static int
afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
{
- extern struct DirEntry *afs_dir_GetBlob();
struct vcache *avc = VTOAFS(FILE_INODE(fp));
struct vrequest treq;
register struct dcache *tdc;
* 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;
+ avc->readdir_pid = MyPidxx2Pid(MyPidxx);
ConvertWToSLock(&avc->lock);
/* Fill in until we get an error or we're done. This implementation
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();
struct vcache *vcp = VTOAFS(FILE_INODE(fp));
cred_t *credp = crref();
struct AFS_FLOCK flock;
+#if defined(POSIX_TEST_LOCK_CONFLICT_ARG)
+ struct file_lock conflict;
+#elif defined(POSIX_TEST_LOCK_RETURNS_CONFLICT)
+ struct file_lock *conflict;
+#endif
+
/* Convert to a lock format afs_lockctl understands. */
memset((char *)&flock, 0, sizeof(flock));
flock.l_type = flp->fl_type;
flock.l_pid = flp->fl_pid;
flock.l_whence = 0;
flock.l_start = flp->fl_start;
- flock.l_len = flp->fl_end - flp->fl_start;
+ flock.l_len = flp->fl_end - flp->fl_start + 1;
/* Safe because there are no large files, yet */
#if defined(F_GETLK64) && (F_GETLK != F_GETLK64)
#ifdef AFS_LINUX24_ENV
if ((code == 0 || flp->fl_type == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
-#ifdef POSIX_LOCK_FILE_WAIT_ARG
+# ifdef POSIX_LOCK_FILE_WAIT_ARG
code = posix_lock_file(fp, flp, 0);
-#else
+# else
flp->fl_flags &=~ FL_SLEEP;
code = posix_lock_file(fp, flp);
-#endif
+# endif
if (code && flp->fl_type != F_UNLCK) {
struct AFS_FLOCK flock2;
flock2 = flock;
AFS_GUNLOCK();
}
}
+ /* If lockctl says there are no conflicting locks, then also check with the
+ * kernel, as lockctl knows nothing about byte range locks
+ */
+ if (code == 0 && cmd == F_GETLK && flock.l_type == F_UNLCK) {
+# if defined(POSIX_TEST_LOCK_CONFLICT_ARG)
+ if (posix_test_lock(fp, flp, &conflict)) {
+ locks_copy_lock(flp, &conflict);
+ flp->fl_type = F_UNLCK;
+ crfree(credp);
+ return 0;
+ }
+# elif defined(POSIX_TEST_LOCK_RETURNS_CONFLICT)
+ if ((conflict = posix_test_lock(fp, flp))) {
+ locks_copy_lock(flp, conflict);
+ flp->fl_type = F_UNLCK;
+ crfee(credp);
+ return 0;
+ }
+# else
+ posix_test_lock(fp, flp);
+ /* If we found a lock in the kernel's structure, return it */
+ if (flp->fl_type != F_UNLCK) {
+ crfree(credp);
+ return 0;
+ }
+ }
+# endif
+
#endif
/* Convert flock back to Linux's file_lock */
flp->fl_type = flock.l_type;
flp->fl_pid = flock.l_pid;
flp->fl_start = flock.l_start;
- flp->fl_end = flock.l_start + flock.l_len;
+ flp->fl_end = flock.l_start + flock.l_len - 1;
crfree(credp);
return -code;
&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);
- 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 */
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) {
goto good_dentry;
if (vcp->mvstat == 1) { /* mount point */
- if (vcp->mvid && (vcp->states & CMValid)) {
- /* a mount point, not yet replaced by its directory */
- goto bad_dentry;
+ if (vcp->mvid && (vcp->f.states & CMValid)) {
+ 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 */
* 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
/* 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;
}
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)
if (code == ENOENT)
return ERR_PTR(0);
#endif
- else
- return ERR_PTR(-code);
+ else if ((code >= 0) && (code <= MAX_ERRNO))
+ return ERR_PTR(-code);
+ else
+ return ERR_PTR(-EIO);
#else
if (code == ENOENT)
code = 0;
maybe_lock_kernel();
#endif
if (VREFCOUNT(tvc) > 1 && tvc->opens > 0
- && !(tvc->states & CUnlinked)) {
+ && !(tvc->f.states & CUnlinked)) {
struct dentry *__dp;
char *__name;
- extern char *afs_newname();
__dp = NULL;
__name = NULL;
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();
if (code < 0) {
dput(basep);
- res = ERR_PTR(code);
+ if (code < -MAX_ERRNO)
+ res = ERR_PTR(-EIO);
+ else
+ res = ERR_PTR(code);
} else {
name[code] = '\0';
res = lookup_dentry(name, basep, follow);
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));
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_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
ICL_TYPE_INT32, 99999);
+ ObtainWriteLock(&vcp->lock, 532);
+ if (vcp->f.states & CPageWrite) {
+ ReleaseWriteLock(&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
+ }
+ vcp->f.states |= CPageWrite;
+ ReleaseWriteLock(&vcp->lock);
+
setup_uio(&tuio, &iovec, buffer, base, count, UIO_WRITE, AFS_UIOSYS);
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;
+ ObtainWriteLock(&vcp->lock, 533);
if (!code) {
struct vrequest treq;
- ObtainWriteLock(&vcp->lock, 533);
if (!afs_InitReq(&treq, credp))
code = afs_DoPartialWrite(vcp, &treq);
- ReleaseWriteLock(&vcp->lock);
}
code = code ? -code : count - tuio.uio_resid;
+ vcp->f.states &= ~CPageWrite;
+ ReleaseWriteLock(&vcp->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, code);
#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;
do_it:
status = afs_linux_writepage_sync(inode, pp, 0, offset);
SetPageUptodate(pp);
- UnlockPage(pp);
+#if defined(WRITEPAGE_ACTIVATE)
+ if ( status != WRITEPAGE_ACTIVATE )
+#else
+ if ( status != AOP_WRITEPAGE_ACTIVATE )
+#endif
+ UnlockPage(pp);
if (status == offset)
return 0;
else
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);
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;
+#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;
+}
#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);
+#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