#include "afs/afs_stats.h"
#include "afs/afs_osidnlc.h"
#include "h/mm.h"
+#ifdef HAVE_MM_INLINE_H
+#include "h/mm_inline.h"
+#endif
#include "h/pagemap.h"
#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.
cred_t *credp = crref();
struct afs_fakestat_state fakestat;
- AFS_GLOCK();
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
+ AFS_GLOCK();
AFS_STATCNT(afs_readdir);
code = afs_InitReq(&treq, credp);
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);
out:
afs_PutFakeStat(&fakestat);
out1:
+ AFS_GUNLOCK();
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
#endif
- AFS_GUNLOCK();
return code;
}
ReleaseWriteLock(&vcp->lock);
}
- unlock_exit:
AFS_GUNLOCK();
}
int code;
cred_t *credp = crref();
- AFS_GLOCK();
#ifdef AFS_LINUX24_ENV
lock_kernel();
#endif
+ AFS_GLOCK();
code = afs_open((struct vcache **)&ip, fp->f_flags, credp);
+ AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
cred_t *credp = crref();
struct vcache *vcp = ITOAFS(ip);
- AFS_GLOCK();
#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);
}
+ AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
struct inode *ip = FILE_INODE(fp);
cred_t *credp = crref();
- AFS_GLOCK();
#ifdef AFS_LINUX24_ENV
lock_kernel();
#endif
+ AFS_GLOCK();
code = afs_fsync(ITOAFS(ip), credp);
+ AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
int code = 0;
struct vcache *vcp = ITOAFS(FILE_INODE(fp));
cred_t *credp = crref();
-#ifdef AFS_LINUX24_ENV
- struct flock64 flock;
-#else
- struct flock flock;
-#endif
-
+ struct AFS_FLOCK flock;
/* Convert to a lock format afs_lockctl understands. */
memset((char *)&flock, 0, sizeof(flock));
flock.l_type = flp->fl_type;
.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,
struct vcache *vcp = ITOAFS(dp->d_inode);
struct vcache *rootvp = NULL;
+#ifdef AFS_LINUX24_ENV
+ lock_kernel();
+#endif
AFS_GLOCK();
if (afs_fakestat_enable && vcp->mvstat == 1 && vcp->mvid
rootvp = afs_FindVCache(vcp->mvid, 0, 0);
ReleaseSharedLock(&afs_xvcache);
}
-#ifdef AFS_LINUX24_ENV
- lock_kernel();
-#endif
/* Make this a fast path (no crref), since it's called so often. */
if (vcp->states & CStatd) {
vcache2fakeinode(rootvp, vcp);
else
vcache2inode(vcp);
-#ifdef AFS_LINUX24_ENV
- unlock_kernel();
-#endif
if (rootvp)
afs_PutVCache(rootvp);
AFS_GUNLOCK();
+#ifdef AFS_LINUX24_ENV
+ unlock_kernel();
+#endif
return 0;
}
if (!code)
code = afs_VerifyVCache(vcp, &treq);
+ AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
* 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;
sysState.allocked = 0;
- AFS_GLOCK();
+#ifdef AFS_LINUX24_ENV
lock_kernel();
+#endif
+ AFS_GLOCK();
vcp = ITOAFS(dp->d_inode);
parentvcp = ITOAFS(dp->d_parent->d_inode);
if (sysState.allocked)
osi_FreeLargeSpace(name);
+ AFS_GUNLOCK();
+
if (bad_dentry) {
shrink_dcache_parent(dp);
d_drop(dp);
}
+#ifdef AFS_LINUX24_ENV
unlock_kernel();
- AFS_GUNLOCK();
+#endif
crfree(credp);
return !bad_dentry;
static void
afs_dentry_iput(struct dentry *dp, struct inode *ip)
{
+ int isglock;
+
if (ICL_SETACTIVE(afs_iclSetp)) {
- AFS_GLOCK();
+ isglock = ISAFS_GLOCK();
+ if (!isglock) AFS_GLOCK();
afs_Trace3(afs_iclSetp, CM_TRACE_DENTRYIPUT, ICL_TYPE_POINTER, ip,
ICL_TYPE_STRING, dp->d_parent->d_name.name,
ICL_TYPE_STRING, dp->d_name.name);
- AFS_GUNLOCK();
+ if (!isglock) AFS_GUNLOCK();
}
osi_iput(ip);
static int
afs_dentry_delete(struct dentry *dp)
{
+ int isglock;
if (ICL_SETACTIVE(afs_iclSetp)) {
- AFS_GLOCK();
+ isglock = ISAFS_GLOCK();
+ if (!isglock) AFS_GLOCK();
afs_Trace3(afs_iclSetp, CM_TRACE_DENTRYDELETE, ICL_TYPE_POINTER,
dp->d_inode, ICL_TYPE_STRING, dp->d_parent->d_name.name,
ICL_TYPE_STRING, dp->d_name.name);
- AFS_GUNLOCK();
+ if (!isglock) AFS_GUNLOCK();
}
if (dp->d_inode && (ITOAFS(dp->d_inode)->states & CUnlinked))
*
* 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;
VATTR_NULL(&vattr);
vattr.va_mode = mode;
- AFS_GLOCK();
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#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_GUNLOCK();
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
}
/* 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)
struct vcache *vcp = NULL;
const char *comp = dp->d_name.name;
- AFS_GLOCK();
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
+ AFS_GLOCK();
code = afs_lookup(ITOAFS(dip), comp, &vcp, credp);
+ AFS_GUNLOCK();
if (vcp) {
struct inode *ip = AFSTOI(vcp);
printk
("afs_linux_lookup: ip->i_mode 0x%x dp->d_name.name %s code %d\n",
ip->i_mode, dp->d_name.name, code);
+#ifdef STRUCT_INODE_HAS_I_SECURITY
+ if (ip->i_security == NULL) {
+ if (security_inode_alloc(ip))
+ panic("afs_linux_lookup: Cannot allocate inode security");
+ }
+#endif
#else
if (S_ISDIR(ip->i_mode))
ip->i_op = &afs_dir_iops;
ip->i_op = &afs_symlink_iops;
#endif
}
- dp->d_time = jiffies;
dp->d_op = &afs_dentry_operations;
d_add(dp, AFSTOI(vcp));
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
/* It's ok for the file to not be found. That's noted by the caller by
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);
- AFS_GLOCK();
#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)
- lock_kernel();
+ unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
}
struct vattr vattr;
const char *name = dp->d_name.name;
- AFS_GLOCK();
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
+ AFS_GLOCK();
VATTR_NULL(&vattr);
vattr.va_mask = ATTR_MODE;
vattr.va_mode = mode;
code = afs_mkdir(ITOAFS(dip), name, &vattr, &tvcp, credp);
+ AFS_GUNLOCK();
if (tvcp) {
tvcp->v.v_op = &afs_dir_iops;
tvcp->v.v_fop = &afs_dir_fops;
#endif
dp->d_op = &afs_dentry_operations;
- dp->d_time = jiffies;
d_instantiate(dp, AFSTOI(tvcp));
}
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
}
cred_t *credp = crref();
const char *name = dp->d_name.name;
- AFS_GLOCK();
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
+ AFS_GLOCK();
code = afs_rmdir(ITOAFS(dip), name, credp);
+ AFS_GUNLOCK();
/* Linux likes to see ENOTEMPTY returned from an rmdir() syscall
* that failed because a directory is not empty. So, we map
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
}
cred_t *credp = crref();
const char *oldname = olddp->d_name.name;
const char *newname = newdp->d_name.name;
+ struct dentry *rehash = NULL;
- AFS_GLOCK();
#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();
#endif
- AFS_GUNLOCK();
crfree(credp);
return -code;
int cnt = page_count(pp);
struct vcache *avc = ITOAFS(ip);
- AFS_GLOCK();
- 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 */
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
address = kmap(pp);
ClearPageError(pp);
-
- lock_kernel();
#else
atomic_add(1, &pp->count);
set_bit(PG_locked, &pp->flags); /* other bits? See mm.h */
setup_uio(&tuio, &iovec, (char *)address, offset, PAGESIZE, UIO_READ,
AFS_UIOSYS);
+#ifdef AFS_LINUX24_ENV
+ lock_kernel();
+#endif
+ AFS_GLOCK();
+ 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, &tuio, UIO_READ, 0, credp);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ afs_Trace4(afs_iclSetp, CM_TRACE_READPAGE, ICL_TYPE_POINTER, ip,
+ ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, cnt, ICL_TYPE_INT32,
+ code);
+ AFS_GUNLOCK();
+#ifdef AFS_LINUX24_ENV
unlock_kernel();
#endif
set_bit(PG_uptodate, &pp->flags);
#endif
}
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
kunmap(pp);
UnlockPage(pp);
struct dcache *tdc;
struct vrequest treq;
+ AFS_GLOCK();
code = afs_InitReq(&treq, credp);
if (!code && !NBObtainWriteLock(&avc->lock, 534)) {
tdc = afs_FindDCache(avc, offset);
}
ReleaseWriteLock(&avc->lock);
}
+ AFS_GUNLOCK();
}
crfree(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_GUNLOCK();
return -code;
}
#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;
/* 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();
{
int code;
- AFS_GLOCK();
lock_kernel();
+ AFS_GLOCK();
code = afs_linux_updatepage(file, page, offset, to - offset);
- unlock_kernel();
AFS_GUNLOCK();
+ unlock_kernel();
kunmap(page);
return code;
char *p = (char *)kmap(page);
int code;
- AFS_GLOCK();
lock_kernel();
+ AFS_GLOCK();
code = afs_linux_ireadlink(ip, p, PAGE_SIZE, AFS_UIOSYS);
+ AFS_GUNLOCK();
if (code < 0)
goto fail;
p[code] = '\0'; /* null terminate? */
unlock_kernel();
- AFS_GUNLOCK();
SetPageUptodate(page);
kunmap(page);
fail:
unlock_kernel();
- AFS_GUNLOCK();
SetPageError(page);
kunmap(page);
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,
+#endif
.setattr = afs_notify_change,
#else
.readlink = afs_linux_readlink,
git://git.openafs.org / openafs.git / blobdiff