/*
* 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.
*/
#define MAX_ERRNO 1000L
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
+/* Enable our workaround for a race with d_splice_alias. The race was fixed in
+ * 2.6.34, so don't do it after that point. */
+# define D_SPLICE_ALIAS_RACE
+#endif
+
int cachefs_noreadpage = 0;
extern struct backing_dev_info *afs_backing_dev_info;
if (code) {
if (!(avc->f.states & CCorrupt)) {
struct cell *tc = afs_GetCellStale(avc->f.fid.Cell, READ_LOCK);
- afs_warn("Corrupt directory (%d.%d.%d.%d [%s] @%lx, pos %d)",
+ afs_warn("afs: Corrupt directory (%d.%d.%d.%d [%s] @%lx, pos %d)\n",
avc->f.fid.Cell, avc->f.fid.Fid.Volume,
avc->f.fid.Fid.Vnode, avc->f.fid.Fid.Unique,
tc ? tc->cellName : "",
/* 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.
cred_t *credp = crref();
#if defined(FOP_FSYNC_TAKES_RANGE)
- mutex_lock(&ip->i_mutex);
+ afs_linux_lock_inode(ip);
#endif
AFS_GLOCK();
code = afs_fsync(VTOAFS(ip), credp);
AFS_GUNLOCK();
#if defined(FOP_FSYNC_TAKES_RANGE)
- mutex_unlock(&ip->i_mutex);
+ afs_linux_unlock_inode(ip);
#endif
crfree(credp);
return afs_convert_code(code);
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);
#ifdef STRUCT_FILE_OPERATIONS_HAS_READ_ITER
.read_iter = afs_linux_read_iter,
.write_iter = afs_linux_write_iter,
-# if !defined(HAVE_LINUX___VFS_READ)
+# if !defined(HAVE_LINUX___VFS_WRITE) && !defined(HAVE_LINUX_KERNEL_WRITE)
.read = new_sync_read,
.write = new_sync_write,
# endif
d_prune_aliases(ip);
-# ifdef HAVE_DCACHE_LOCK
- spin_lock(&dcache_lock);
-# else
- spin_lock(&ip->i_lock);
-# endif
+ afs_d_alias_lock(ip);
#if defined(D_ALIAS_IS_HLIST)
# if defined(HLIST_ITERATOR_NO_NODE)
vcp->target_link = ret;
-# ifdef HAVE_DCACHE_LOCK
- if (ret) {
- dget_locked(ret);
- }
- spin_unlock(&dcache_lock);
-# else
if (ret) {
- dget(ret);
+ afs_linux_dget(ret);
}
- spin_unlock(&ip->i_lock);
-# endif
+ afs_d_alias_unlock(ip);
return ret;
}
return afs_convert_code(code);
}
+#if defined(IOP_GETATTR_TAKES_PATH_STRUCT)
+static int
+afs_linux_getattr(const struct path *path, struct kstat *stat, u32 request_mask, unsigned int sync_mode)
+{
+ int err = afs_linux_revalidate(path->dentry);
+ if (!err) {
+ generic_fillattr(path->dentry->d_inode, stat);
+ }
+ return err;
+}
+#else
static int
afs_linux_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
{
int err = afs_linux_revalidate(dentry);
if (!err) {
generic_fillattr(dentry->d_inode, stat);
+ }
+ return err;
}
- return err;
-}
+#endif
static afs_uint32
-parent_vcache_dv(struct inode *inode, cred_t *credp, int locked)
+parent_vcache_dv(struct inode *inode, cred_t *credp)
{
int free_cred = 0;
struct vcache *pvcp;
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);
}
+#ifdef D_SPLICE_ALIAS_RACE
+/* Leave some trace that this code is enabled; otherwise it's pretty hard to
+ * tell. */
+static __attribute__((used)) const char dentry_race_marker[] = "d_splice_alias race workaround enabled";
+
+static int
+check_dentry_race(struct dentry *dp)
+{
+ int raced = 0;
+ if (!dp->d_inode) {
+ struct dentry *parent = dget_parent(dp);
+
+ /* In Linux, before commit 4919c5e45a91b5db5a41695fe0357fbdff0d5767,
+ * d_splice_alias can momentarily hash a dentry before it's fully
+ * populated. This only happens for a moment, since it's unhashed again
+ * right after (in d_move), but this can make the dentry be found by
+ * __d_lookup, and then given to us.
+ *
+ * So check if the dentry is unhashed; if it is, then the dentry is not
+ * valid. We lock the parent inode to ensure that d_splice_alias is no
+ * longer running (the inode mutex will be held during
+ * afs_linux_lookup). Locking d_lock is required to check the dentry's
+ * flags, so lock that, too.
+ */
+ afs_linux_lock_inode(parent->d_inode);
+ spin_lock(&dp->d_lock);
+ if (d_unhashed(dp)) {
+ raced = 1;
+ }
+ spin_unlock(&dp->d_lock);
+ afs_linux_unlock_inode(parent->d_inode);
+
+ dput(parent);
+ }
+ return raced;
+}
+#endif /* D_SPLICE_ALIAS_RACE */
+
/* 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..
*
struct dentry *parent;
int valid;
struct afs_fakestat_state fakestate;
- int locked = 0;
int force_drop = 0;
afs_uint32 parent_dv;
return -ECHILD;
#endif
+#ifdef D_SPLICE_ALIAS_RACE
+ if (check_dentry_race(dp)) {
+ valid = 0;
+ return valid;
+ }
+#endif
+
+ AFS_GLOCK();
afs_InitFakeStat(&fakestate);
if (dp->d_inode) {
if (vcp == afs_globalVp)
goto good_dentry;
- parent = dget_parent(dp);
- pvcp = VTOAFS(parent->d_inode);
+ 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;
- if ((vcp->mvstat != AFS_MVSTAT_FILE) ||
- (pvcp->mvstat == AFS_MVSTAT_MTPT && afs_fakestat_enable)) { /* need to lock */
- credp = crref();
- AFS_GLOCK();
- locked = 1;
- }
+ credp = crref();
- if (locked) {
- 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;
-
- code = afs_CreateReq(&treq, credp);
- if (code) {
- dput(parent);
- goto bad_dentry;
- }
- if ((strcmp(dp->d_name.name, ".directory") == 0)) {
- tryEvalOnly = 1;
- }
- if (tryEvalOnly)
- code = afs_TryEvalFakeStat(&vcp, &fakestate, treq);
- else
- code = afs_EvalFakeStat(&vcp, &fakestate, treq);
- afs_DestroyReq(treq);
- if ((tryEvalOnly && vcp->mvstat == AFS_MVSTAT_MTPT) || code) {
- /* a mount point, not yet replaced by its directory */
- dput(parent);
- goto bad_dentry;
- }
+ code = afs_CreateReq(&treq, credp);
+ if (code) {
+ goto bad_dentry;
+ }
+ if ((strcmp(dp->d_name.name, ".directory") == 0)) {
+ tryEvalOnly = 1;
+ }
+ if (tryEvalOnly)
+ code = afs_TryEvalFakeStat(&vcp, &fakestate, treq);
+ else
+ code = afs_EvalFakeStat(&vcp, &fakestate, treq);
+ afs_DestroyReq(treq);
+ if ((tryEvalOnly && vcp->mvstat == AFS_MVSTAT_MTPT) || code) {
+ /* a mount point, not yet replaced by its directory */
+ goto bad_dentry;
}
- } else if (vcp->mvstat == AFS_MVSTAT_ROOT && *dp->d_name.name != '/') {
- osi_Assert(vcp->mvid.parent != NULL);
}
+ } else if (vcp->mvstat == AFS_MVSTAT_ROOT && *dp->d_name.name != '/') {
+ osi_Assert(vcp->mvid.parent != NULL);
}
#ifdef notdef
*/
if (vcp->last_looker != treq.uid) {
if (!afs_AccessOK(vcp, (vType(vcp) == VREG) ? PRSFS_READ : PRSFS_LOOKUP, &treq, CHECK_MODE_BITS)) {
- dput(parent);
goto bad_dentry;
}
}
#endif
- parent_dv = parent_vcache_dv(parent->d_inode, credp, locked);
+ parent = dget_parent(dp);
+ pvcp = VTOAFS(parent->d_inode);
+ parent_dv = parent_vcache_dv(parent->d_inode, credp);
/* If the parent's DataVersion has changed or the vnode
* is longer valid, we need to do a full lookup. VerifyVCache
* isn't enough since the vnode may have been renamed.
*/
- if ((!locked) && (parent_dv > dp->d_time || !(vcp->f.states & CStatd)) ) {
- credp = crref();
- AFS_GLOCK();
- locked = 1;
- }
-
- if (locked && (parent_dv > dp->d_time || !(vcp->f.states & CStatd))) {
+ if (parent_dv > dp->d_time || !(vcp->f.states & CStatd)) {
struct vattr *vattr = NULL;
int code;
int lookup_good;
+ if (credp == NULL) {
+ credp = crref();
+ }
code = afs_lookup(pvcp, (char *)dp->d_name.name, &tvc, credp);
if (code) {
parent = dget_parent(dp);
pvcp = VTOAFS(parent->d_inode);
- parent_dv = parent_vcache_dv(parent->d_inode, credp, locked);
+ parent_dv = parent_vcache_dv(parent->d_inode, credp);
if (parent_dv > dp->d_time || !(pvcp->f.states & CStatd)
|| afs_IsDynroot(pvcp)) {
good_dentry:
valid = 1;
+ goto done;
+
+ bad_dentry:
+ valid = 0;
+#ifndef D_INVALIDATE_IS_VOID
+ /* When (v3.18) d_invalidate was converted to void, it also started
+ * being called automatically from revalidate, and automatically
+ * handled:
+ * - shrink_dcache_parent
+ * - automatic detach of submounts
+ * - d_drop
+ * Therefore, after that point, OpenAFS revalidate logic no longer needs
+ * to do any of those things itself for invalid dentry structs. We only need
+ * to tell VFS it's invalid (by returning 0), and VFS will handle the rest.
+ */
+ if (have_submounts(dp))
+ valid = 1;
+#endif
done:
/* Clean up */
if (tvc)
afs_PutVCache(tvc);
- afs_PutFakeStat(&fakestate); /* from here on vcp may be no longer valid */
- if (locked) {
- /* we hold the global lock if we evaluated a mount point */
- AFS_GUNLOCK();
- }
+ afs_PutFakeStat(&fakestate);
+ AFS_GUNLOCK();
if (credp)
crfree(credp);
+#ifndef D_INVALIDATE_IS_VOID
if (!valid) {
/*
* If we had a negative lookup for the name we want to forcibly
} else
d_invalidate(dp);
}
-
+#endif
return valid;
- bad_dentry:
- if (have_submounts(dp))
- valid = 1;
- else
- valid = 0;
- goto done;
}
static void
{
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, 1);
+ dp->d_time = parent_vcache_dv(dip, credp);
d_instantiate(dp, ip);
}
int code;
AFS_GLOCK();
+
code = afs_lookup(VTOAFS(dip), (char *)comp, &vcp, credp);
-
- if (!code) {
+ if (code == ENOENT) {
+ /* It's ok for the file to not be found. That's noted by the caller by
+ * seeing that the dp->d_inode field is NULL (set by d_splice_alias or
+ * d_add, below). */
+ code = 0;
+ osi_Assert(vcp == NULL);
+ }
+ if (code) {
+ AFS_GUNLOCK();
+ goto done;
+ }
+
+ if (vcp) {
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, 1);
+ dp->d_time = parent_vcache_dv(dip, credp);
AFS_GUNLOCK();
done:
crfree(credp);
- /* It's ok for the file to not be found. That's noted by the caller by
- * seeing that the dp->d_inode field is NULL.
- */
- if (!code || code == ENOENT) {
- /*
- * d_splice_alias can return an error (EIO) if there is an existing
- * connected directory alias for this dentry.
- */
- if (!IS_ERR(newdp)) {
- iput(ip);
- return newdp;
- } else {
- d_add(dp, ip);
- /*
- * Depending on the kernel version, d_splice_alias may or may
- * not drop the inode reference on error. If it didn't, do it
- * here.
- */
+ if (IS_ERR(newdp)) {
+ /* d_splice_alias can return an error (EIO) if there is an existing
+ * connected directory alias for this dentry. Add our dentry manually
+ * ourselves if this happens. */
+ d_add(dp, ip);
+
#if defined(D_SPLICE_ALIAS_LEAK_ON_ERROR)
- iput(ip);
+ /* Depending on the kernel version, d_splice_alias may or may not drop
+ * the inode reference on error. If it didn't, do it here. */
+ iput(ip);
#endif
- return NULL;
- }
- } else {
+ return NULL;
+ }
+
+ if (code) {
if (ip)
iput(ip);
return ERR_PTR(afs_convert_code(code));
}
+
+ iput(ip);
+ return newdp;
}
static int
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);
d_instantiate(dp, ip);
}
afs_DestroyAttr(vattr);
static int
afs_linux_rename(struct inode *oldip, struct dentry *olddp,
- struct inode *newip, struct dentry *newdp)
+ struct inode *newip, struct dentry *newdp
+#ifdef HAVE_LINUX_INODE_OPERATIONS_RENAME_TAKES_FLAGS
+ , unsigned int flags
+#endif
+ )
{
int code;
cred_t *credp = crref();
const char *newname = newdp->d_name.name;
struct dentry *rehash = NULL;
+#ifdef HAVE_LINUX_INODE_OPERATIONS_RENAME_TAKES_FLAGS
+ if (flags)
+ return -EINVAL; /* no support for new flags yet */
+#endif
+
/* Prevent any new references during rename operation. */
if (!d_unhashed(newdp)) {
}
-/* 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
/* If we're trying to read a page that's past the end of the disk
* cache file, then just return a zeroed page */
if (AFS_CHUNKOFFSET(offset) >= i_size_read(cacheinode)) {
- zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+ zero_user_segment(page, 0, PAGE_SIZE);
SetPageUptodate(page);
if (task)
unlock_page(page);
/* From our offset, we now need to work out which page in the disk
* file it corresponds to. This will be fun ... */
- pageindex = (offset - AFS_CHUNKTOBASE(chunk)) >> PAGE_CACHE_SHIFT;
+ pageindex = (offset - AFS_CHUNKTOBASE(chunk)) >> PAGE_SHIFT;
while (cachepage == NULL) {
cachepage = find_get_page(cachemapping, pageindex);
if (!cachepage) {
if (!newpage)
- newpage = page_cache_alloc_cold(cachemapping);
+ newpage = page_cache_alloc(cachemapping);
if (!newpage) {
code = -ENOMEM;
goto out;
cachepage = newpage;
newpage = NULL;
- page_cache_get(cachepage);
+ get_page(cachepage);
if (!pagevec_add(lrupv, cachepage))
__pagevec_lru_add_file(lrupv);
} else {
- page_cache_release(newpage);
+ put_page(newpage);
newpage = NULL;
if (code != -EEXIST)
goto out;
out:
if (cachepage)
- page_cache_release(cachepage);
+ put_page(cachepage);
return code;
}
AFS_GLOCK();
goto out;
}
+#if defined(PAGEVEC_INIT_COLD_ARG)
pagevec_init(&lrupv, 0);
+#else
+ pagevec_init(&lrupv);
+#endif
code = afs_linux_read_cache(cacheFp, pp, tdc->f.chunk, &lrupv, NULL);
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);
}
ancr->offset = auio->uio_offset;
ancr->length = auio->uio_resid;
+#if defined(PAGEVEC_INIT_COLD_ARG)
pagevec_init(&lrupv, 0);
+#else
+ pagevec_init(&lrupv);
+#endif
for(page_ix = 0; page_ix < num_pages; ++page_ix) {
/* If we allocate a page and don't remove it from page_list,
* the page cache gets upset. */
list_del(&pp->lru);
- isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT;
+ isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_SHIFT;
if(pp->index > isize) {
if(PageLocked(pp))
unlock_page(pp);
if(base_index != pp->index) {
if(PageLocked(pp))
unlock_page(pp);
- page_cache_release(pp);
+ put_page(pp);
iovecp[page_ix].iov_base = (void *) 0;
base_index++;
ancr->length -= PAGE_SIZE;
if(code) {
if(PageLocked(pp))
unlock_page(pp);
- page_cache_release(pp);
+ put_page(pp);
iovecp[page_ix].iov_base = (void *) 0;
} else {
page_count++;
* it as up to date.
*/
if (page_offset(pp) >= i_size_read(fp->f_mapping->host)) {
- zero_user_segment(pp, 0, PAGE_CACHE_SIZE);
+ zero_user_segment(pp, 0, PAGE_SIZE);
SetPageUptodate(pp);
unlock_page(pp);
return 0;
task = afs_pagecopy_init_task();
tdc = NULL;
+#if defined(PAGEVEC_INIT_COLD_ARG)
pagevec_init(&lrupv, 0);
+#else
+ pagevec_init(&lrupv);
+#endif
for (page_idx = 0; page_idx < num_pages; page_idx++) {
struct page *page = list_entry(page_list->prev, struct page, lru);
list_del(&page->lru);
if (tdc && !add_to_page_cache(page, mapping, page->index,
GFP_KERNEL)) {
- page_cache_get(page);
+ get_page(page);
if (!pagevec_add(&lrupv, page))
__pagevec_lru_add_file(&lrupv);
afs_linux_read_cache(cacheFp, page, tdc->f.chunk, &lrupv, task);
}
- page_cache_release(page);
+ put_page(page);
}
if (pagevec_count(&lrupv))
__pagevec_lru_add_file(&lrupv);
struct inode *inode;
struct vcache *vcp;
cred_t *credp;
- unsigned int to = PAGE_CACHE_SIZE;
+ unsigned int to = PAGE_SIZE;
loff_t isize;
int code = 0;
int code1 = 0;
- page_cache_get(pp);
+ get_page(pp);
inode = mapping->host;
vcp = VTOAFS(inode);
done:
end_page_writeback(pp);
- page_cache_release(pp);
+ put_page(pp);
if (code1)
return code1;
/* Is the location we are writing to beyond the end of the file? */
if (pagebase >= isize ||
((from == 0) && (pagebase + to) >= isize)) {
- zero_user_segments(page, 0, from, to, PAGE_CACHE_SIZE);
+ zero_user_segments(page, 0, from, to, PAGE_SIZE);
SetPageChecked(page);
/* Are we we writing a full page */
- } else if (from == 0 && to == PAGE_CACHE_SIZE) {
+ } else if (from == 0 && to == PAGE_SIZE) {
SetPageChecked(page);
/* Is the page readable, if it's wronly, we don't care, because we're
* not actually going to read from it ... */
struct page *page, void *fsdata)
{
int code;
- unsigned int from = pos & (PAGE_CACHE_SIZE - 1);
+ unsigned int from = pos & (PAGE_SIZE - 1);
- code = afs_linux_commit_write(file, page, from, from + len);
+ code = afs_linux_commit_write(file, page, from, from + copied);
unlock_page(page);
- page_cache_release(page);
+ put_page(page);
return code;
}
struct page **pagep, void **fsdata)
{
struct page *page;
- pgoff_t index = pos >> PAGE_CACHE_SHIFT;
- unsigned int from = pos & (PAGE_CACHE_SIZE - 1);
+ pgoff_t index = pos >> PAGE_SHIFT;
+ unsigned int from = pos & (PAGE_SIZE - 1);
int code;
page = grab_cache_page_write_begin(mapping, index, flags);
code = afs_linux_prepare_write(file, page, from, from + len);
if (code) {
unlock_page(page);
- page_cache_release(page);
+ put_page(page);
}
return code;
static struct inode_operations afs_symlink_iops = {
#if defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
.readlink = page_readlink,
-# if defined(HAVE_LINUX_PAGE_FOLLOW_LINK)
+# if defined(HAVE_LINUX_PAGE_GET_LINK)
+ .get_link = page_get_link,
+# elif defined(HAVE_LINUX_PAGE_FOLLOW_LINK)
.follow_link = page_follow_link,
# else
.follow_link = page_follow_link_light,
void
afs_fill_inode(struct inode *ip, struct vattr *vattr)
{
-
if (vattr)
vattr2inode(ip, vattr);
} else if (S_ISLNK(ip->i_mode)) {
ip->i_op = &afs_symlink_iops;
+#if defined(HAVE_LINUX_INODE_NOHIGHMEM)
+ inode_nohighmem(ip);
+#endif
#if defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
ip->i_data.a_ops = &afs_symlink_aops;
ip->i_mapping = &ip->i_data;
git://git.openafs.org / openafs.git / blobdiff