#if defined(AFS_LINUX24_ENV)
#include "h/smp_lock.h"
#endif
+#if defined(AFS_LINUX26_ENV)
+#include "h/writeback.h"
+#endif
#ifdef pgoff2loff
#define pageoff(pp) pgoff2loff((pp)->index)
if (*offp + count > afs_vmMappingEnd) {
uio_t tuio;
struct iovec iov;
- afs_size_t oldOffset = *offp;
afs_int32 xfered = 0;
if (*offp < afs_vmMappingEnd) {
afs_linux_write(struct file *fp, const char *buf, size_t count, loff_t * offp)
{
ssize_t code = 0;
- int code2;
+ int code2 = 0;
struct vcache *vcp = ITOAFS(fp->f_dentry->d_inode);
struct vrequest treq;
cred_t *credp = crref();
return code;
}
+extern int BlobScan(struct dcache * afile, afs_int32 ablob);
+
/* 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.
code = 0;
offset = (int) fp->f_pos;
while (1) {
- dirpos = BlobScan(&tdc->f.inode, offset);
+ dirpos = BlobScan(tdc, offset);
if (!dirpos)
break;
- de = afs_dir_GetBlob(&tdc->f.inode, dirpos);
+ de = afs_dir_GetBlob(tdc, dirpos);
if (!de)
break;
if (de->name)
len = strlen(de->name);
else {
- printf("afs_linux_readdir: afs_dir_GetBlob failed, null name (inode %x, dirpos %d)\n",
- &tdc->f.inode, dirpos);
+ printf("afs_linux_readdir: afs_dir_GetBlob failed, null name (inode %lx, dirpos %d)\n",
+ (unsigned long)&tdc->f.inode, dirpos);
DRelease((struct buffer *) de, 0);
afs_PutDCache(tdc);
ReleaseReadLock(&avc->lock);
ReleaseWriteLock(&vcp->lock);
}
- unlock_exit:
AFS_GUNLOCK();
}
if (!code)
code = afs_VerifyVCache(vcp, &treq);
+ if (!code && (vcp->states & CRO) &&
+ (vmap->vm_file->f_flags & (FWRITE | FTRUNC)))
+ code = EACCES;
if (code)
code = -code;
return -code;
}
-/* afs_Close is called from release, since release is used to handle all
- * file closings. In addition afs_linux_flush is called from sys_close to
- * handle flushing the data back to the server. The kicker is that we could
- * ignore flush completely if only sys_close took it's return value from
- * fput. See afs_linux_flush for notes on interactions between release and
- * flush.
- */
static int
afs_linux_release(struct inode *ip, struct file *fp)
{
- int code = 0;
- cred_t *credp = crref();
struct vcache *vcp = ITOAFS(ip);
+ cred_t *credp = crref();
+ int code = 0;
#ifdef AFS_LINUX24_ENV
lock_kernel();
#endif
AFS_GLOCK();
- if (vcp->flushcnt) {
- vcp->flushcnt--; /* protected by AFS global lock. */
- } else {
- code = afs_close(vcp, fp->f_flags, credp);
- }
+ code = afs_close(vcp, fp->f_flags, credp);
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
}
/* afs_linux_flush
- * flush is called from sys_close. We could ignore it, but sys_close return
- * code comes from flush, not release. We need to use release to keep
- * the vcache open count correct. Note that flush is called before release
- * (via fput) in sys_close. vcp->flushcnt is a bit of ugliness to avoid
- * races and also avoid calling afs_close twice when closing the file.
- * If we merely checked for opens > 0 in afs_linux_release, then if an
- * new open occurred when storing back the file, afs_linux_release would
- * incorrectly close the file and decrement the opens count. Calling afs_close
- * on the just flushed file is wasteful, since the background daemon will
- * execute the code that finally decides there is nothing to do.
+ * essentially the same as afs_fsync() but we need to get the return
+ * code for the sys_close() here, not afs_linux_release(), so call
+ * afs_StoreAllSegments() with AFS_LASTSTORE
*/
int
afs_linux_flush(struct file *fp)
{
+ struct vrequest treq;
struct vcache *vcp = ITOAFS(FILE_INODE(fp));
- int code = 0;
- cred_t *credp;
+ cred_t *credp = crref();
+ int code;
- /* Only do this on the last close of the file pointer. */
-#if defined(AFS_LINUX24_ENV)
- if (atomic_read(&fp->f_count) > 1)
-#else
- if (fp->f_count > 1)
-#endif
- return 0;
+ AFS_GLOCK();
- credp = crref();
+ code = afs_InitReq(&treq, credp);
+ if (code)
+ goto out;
- AFS_GLOCK();
- code = afs_close(vcp, fp->f_flags, credp);
- vcp->flushcnt++; /* protected by AFS global lock. */
+ ObtainSharedLock(&vcp->lock, 535);
+ if (vcp->execsOrWriters > 0) {
+ UpgradeSToWLock(&vcp->lock, 536);
+ code = afs_StoreAllSegments(vcp, &treq, AFS_SYNC | AFS_LASTSTORE);
+ ConvertWToSLock(&vcp->lock);
+ }
+ code = afs_CheckCode(code, &treq, 54);
+ ReleaseSharedLock(&vcp->lock);
+
+out:
AFS_GUNLOCK();
crfree(credp);
.mmap = afs_linux_mmap,
.open = afs_linux_open,
.flush = afs_linux_flush,
+#ifdef AFS_LINUX26_ENV
+ .sendfile = generic_file_sendfile,
+#endif
.release = afs_linux_release,
.fsync = afs_linux_fsync,
.lock = afs_linux_lock,
* later on, we shouldn't have to do it until later. Perhaps in the future..
*/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
+#ifdef DOP_REVALIDATE_TAKES_NAMEIDATA
+static int
+afs_linux_dentry_revalidate(struct dentry *dp, struct nameidata *nd)
+#else
static int
afs_linux_dentry_revalidate(struct dentry *dp, int flags)
+#endif
#else
static int
afs_linux_dentry_revalidate(struct dentry *dp)
#endif
{
- char *name;
+ char *name = NULL;
cred_t *credp = crref();
struct vrequest treq;
struct vcache *lookupvcp = NULL;
*
* name is in kernel space at this point.
*/
+#ifdef IOP_CREATE_TAKES_NAMEIDATA
+int
+afs_linux_create(struct inode *dip, struct dentry *dp, int mode,
+ struct nameidata *nd)
+#else
int
afs_linux_create(struct inode *dip, struct dentry *dp, int mode)
+#endif
{
int code;
cred_t *credp = crref();
struct vattr vattr;
- enum vcexcl excl;
const char *name = dp->d_name.name;
struct inode *ip;
#endif
AFS_GLOCK();
code =
- afs_create(ITOAFS(dip), name, &vattr, NONEXCL, mode,
+ afs_create(ITOAFS(dip), (char *)name, &vattr, NONEXCL, mode,
(struct vcache **)&ip, credp);
if (!code) {
#endif
dp->d_op = &afs_dentry_operations;
- dp->d_time = jiffies;
d_instantiate(dp, ip);
}
/* afs_linux_lookup */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
+#ifdef IOP_LOOKUP_TAKES_NAMEIDATA
+struct dentry *
+afs_linux_lookup(struct inode *dip, struct dentry *dp,
+ struct nameidata *nd)
+#else
struct dentry *
afs_linux_lookup(struct inode *dip, struct dentry *dp)
+#endif
#else
int
afs_linux_lookup(struct inode *dip, struct dentry *dp)
ip->i_op = &afs_symlink_iops;
#endif
}
- dp->d_time = jiffies;
dp->d_op = &afs_dentry_operations;
d_add(dp, AFSTOI(vcp));
int
afs_linux_unlink(struct inode *dip, struct dentry *dp)
{
- int code;
+ int code = EBUSY;
cred_t *credp = crref();
const char *name = dp->d_name.name;
+ struct vcache *tvc = ITOAFS(dp->d_inode);
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
+ if (((VREFCOUNT(tvc) > 0) && tvc->opens > 0)
+ && !(tvc->states & CUnlinked)) {
+ struct dentry *__dp;
+ char *__name;
+ extern char *afs_newname();
+
+ __dp = NULL;
+ __name = NULL;
+ do {
+ dput(__dp);
+
+ AFS_GLOCK();
+ if (__name)
+ osi_FreeSmallSpace(__name);
+ __name = afs_newname();
+ AFS_GUNLOCK();
+
+ __dp = lookup_one_len(__name, dp->d_parent, strlen(__name));
+
+ if (IS_ERR(__dp))
+ goto out;
+ } while (__dp->d_inode != NULL);
+
+ AFS_GLOCK();
+ code = afs_rename(ITOAFS(dip), dp->d_name.name, ITOAFS(dip), __dp->d_name.name, credp);
+ if (!code) {
+ tvc->mvid = __name;
+ crhold(credp);
+ if (tvc->uncred) {
+ crfree(tvc->uncred);
+ }
+ tvc->uncred = credp;
+ tvc->states |= CUnlinked;
+ }
+ AFS_GUNLOCK();
+
+ if (!code)
+ d_move(dp, __dp);
+ dput(__dp);
+
+ goto out;
+ }
+
AFS_GLOCK();
code = afs_remove(ITOAFS(dip), name, credp);
AFS_GUNLOCK();
if (!code)
d_drop(dp);
+out:
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
#endif
tvcp->v.v_fop = &afs_dir_fops;
#endif
dp->d_op = &afs_dentry_operations;
- dp->d_time = jiffies;
d_instantiate(dp, AFSTOI(tvcp));
}
cred_t *credp = crref();
const char *oldname = olddp->d_name.name;
const char *newname = newdp->d_name.name;
+ struct dentry *rehash = NULL;
#if defined(AFS_LINUX26_ENV)
+ /* Prevent any new references during rename operation. */
lock_kernel();
#endif
/* Remove old and new entries from name hash. New one will change below.
* cases. Let another lookup put things right, if need be.
*/
#if defined(AFS_LINUX26_ENV)
- if (!d_unhashed(olddp))
- d_drop(olddp);
- if (!d_unhashed(newdp))
+ if (!d_unhashed(newdp)) {
d_drop(newdp);
+ rehash = newdp;
+ }
#else
- if (!list_empty(&olddp->d_hash))
- d_drop(olddp);
- if (!list_empty(&newdp->d_hash))
+ if (!list_empty(&newdp->d_hash)) {
d_drop(newdp);
+ rehash = newdp;
+ }
#endif
+
+#if defined(AFS_LINUX24_ENV)
+ if (atomic_read(&olddp->d_count) > 1)
+ shrink_dcache_parent(olddp);
+#endif
+
AFS_GLOCK();
code = afs_rename(ITOAFS(oldip), oldname, ITOAFS(newip), newname, credp);
AFS_GUNLOCK();
- if (!code) {
- /* update time so it doesn't expire immediately */
- newdp->d_time = jiffies;
- d_move(olddp, newdp);
- }
+ if (rehash)
+ d_rehash(rehash);
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
}
#if defined(AFS_LINUX24_ENV)
+#ifdef AOP_WRITEPAGE_TAKES_WRITEBACK_CONTROL
+int
+afs_linux_writepage(struct page *pp, struct writeback_control *wbc)
+#else
int
afs_linux_writepage(struct page *pp)
+#endif
{
struct address_space *mapping = pp->mapping;
struct inode *inode;
unsigned offset = PAGE_CACHE_SIZE;
long status;
+#if defined(AFS_LINUX26_ENV)
+ if (PageReclaim(pp)) {
+ return WRITEPAGE_ACTIVATE;
+ }
+#else
+ if (PageLaunder(pp)) {
+ return(fail_writepage(pp));
+ }
+#endif
+
inode = (struct inode *)mapping->host;
end_index = inode->i_size >> PAGE_CACHE_SHIFT;
if (pp->index >= end_index + 1 || !offset)
return -EIO;
do_it:
- AFS_GLOCK();
status = afs_linux_writepage_sync(inode, pp, 0, offset);
- AFS_GUNLOCK();
SetPageUptodate(pp);
UnlockPage(pp);
if (status == offset)
/* afs_linux_permission
* Check access rights - returns error if can't check or permission denied.
*/
+#ifdef IOP_PERMISSION_TAKES_NAMEIDATA
+int
+afs_linux_permission(struct inode *ip, int mode, struct nameidata *nd)
+#else
int
afs_linux_permission(struct inode *ip, int mode)
+#endif
{
int code;
cred_t *credp = crref();
base = (pp->index << PAGE_CACHE_SHIFT) + offset;
credp = crref();
+ lock_kernel();
+ AFS_GLOCK();
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);
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
ICL_TYPE_INT32, code);
+ AFS_GUNLOCK();
+ unlock_kernel();
crfree(credp);
kunmap(pp);
return code;
}
-static int
-afs_linux_updatepage(struct file *file, struct page *page,
- unsigned long offset, unsigned int count)
-{
- struct dentry *dentry = file->f_dentry;
-
- return afs_linux_writepage_sync(dentry->d_inode, page, offset, count);
-}
#else
/* afs_linux_updatepage
* What one would have thought was writepage - write dirty page to file.
{
int code;
- lock_kernel();
- AFS_GLOCK();
- code = afs_linux_updatepage(file, page, offset, to - offset);
- AFS_GUNLOCK();
- unlock_kernel();
+ code = afs_linux_writepage_sync(file->f_dentry->d_inode, page,
+ offset, to - offset);
+#if !defined(AFS_LINUX26_ENV)
kunmap(page);
+#endif
return code;
}
afs_linux_prepare_write(struct file *file, struct page *page, unsigned from,
unsigned to)
{
+/* sometime between 2.4.0 and 2.4.19, the callers of prepare_write began to
+ call kmap directly instead of relying on us to do it */
+#if !defined(AFS_LINUX26_ENV)
kmap(page);
+#endif
return 0;
}
struct inode_operations afs_symlink_iops = {
#if defined(AFS_LINUX24_ENV)
.readlink = page_readlink,
+#if defined(HAVE_KERNEL_PAGE_FOLLOW_LINK)
.follow_link = page_follow_link,
+#else
+ .follow_link = page_follow_link_light,
+ .put_link = page_put_link,
+#endif
.setattr = afs_notify_change,
#else
.readlink = afs_linux_readlink,
git://git.openafs.org / openafs.git / blobdiff