/*
* Linux specific vnodeops. Also includes the glue routines required to call
- * AFS vnodeops. The "NOTUSED" #define is used to indicate routines and
- * calling sequences present in an ops table that we don't actually use.
- * They are present solely for documentation purposes.
+ * AFS vnodeops.
*
* 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
#define pageoff(pp) pp->offset
#endif
+#if defined(AFS_LINUX26_ENV)
+#define UnlockPage(pp) unlock_page(pp)
+#endif
+
extern struct vcache *afs_globalVp;
extern afs_rwlock_t afs_xvcache;
-extern struct dentry_operations *afs_dops;
#if defined(AFS_LINUX24_ENV)
extern struct inode_operations afs_file_iops;
extern struct address_space_operations afs_file_aops;
extern struct inode_operations afs_symlink_iops;
-#ifdef NOTUSED
-static int
-afs_linux_lseek(struct inode *ip, struct file *fp, off_t, int)
-{
-}
-#endif
-
static ssize_t
afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp)
{
*offp += count;
}
done:
+ ;
} else {
#endif /* AFS_64BIT_CLIENT */
osi_FlushPages(vcp, credp); /* ensure stale pages are gone */
ReleaseWriteLock(&vcp->lock);
}
done:
+ ;
} else {
#endif /* AFS_64BIT_CLIENT */
AFS_GUNLOCK();
struct afs_fakestat_state fakestat;
AFS_GLOCK();
+#if defined(AFS_LINUX26_ENV)
+ lock_kernel();
+#endif
AFS_STATCNT(afs_readdir);
code = afs_InitReq(&treq, credp);
crfree(credp);
- if (code) {
- AFS_GUNLOCK();
- return -code;
- }
+ if (code)
+ goto out1;
afs_InitFakeStat(&fakestat);
code = afs_EvalFakeStat(&avc, &fakestat, &treq);
- if (code) {
- afs_PutFakeStat(&fakestat);
- AFS_GUNLOCK();
- return -code;
- }
+ if (code)
+ goto out;
/* update the cache entry */
tagain:
code = afs_VerifyVCache(avc, &treq);
- if (code) {
- afs_PutFakeStat(&fakestat);
- AFS_GUNLOCK();
- return -code;
- }
+ if (code)
+ goto out;
/* get a reference to the entire directory */
tdc = afs_GetDCache(avc, (afs_size_t) 0, &treq, &origOffset, &tlen, 1);
len = tlen;
if (!tdc) {
- afs_PutFakeStat(&fakestat);
- AFS_GUNLOCK();
- return -ENOENT;
+ code = -ENOENT;
+ goto out;
}
ObtainReadLock(&avc->lock);
ObtainReadLock(&tdc->lock);
* takes an offset in units of blobs, rather than bytes.
*/
code = 0;
- offset = (int)fp->f_pos;
+ offset = (int) fp->f_pos;
while (1) {
dirpos = BlobScan(&tdc->f.inode, offset);
if (!dirpos)
else {
printf("afs_linux_readdir: afs_dir_GetBlob failed, null name (inode %x, dirpos %d)\n",
&tdc->f.inode, dirpos);
- DRelease(de, 0);
+ DRelease((struct buffer *) de, 0);
afs_PutDCache(tdc);
ReleaseReadLock(&avc->lock);
- afs_PutFakeStat(&fakestat);
- return -ENOENT;
+ code = -ENOENT;
+ goto out;
}
/* filldir returns -EINVAL when the buffer is full. */
-#if (defined(AFS_LINUX24_ENV) || defined(pgoff2loff)) && defined(DECLARE_FSTYPE)
+#if defined(AFS_LINUX26_ENV) || ((defined(AFS_LINUX24_ENV) || defined(pgoff2loff)) && defined(DECLARE_FSTYPE))
{
unsigned int type = DT_UNKNOWN;
struct VenusFid afid;
#else
code = (*filldir) (dirbuf, de->name, len, offset, ino);
#endif
- DRelease(de, 0);
+ DRelease((struct buffer *)de, 0);
if (code)
break;
offset = dirpos + 1 + ((len + 16) >> 5);
ReleaseReadLock(&tdc->lock);
afs_PutDCache(tdc);
ReleaseReadLock(&avc->lock);
+ code = 0;
+
+out:
afs_PutFakeStat(&fakestat);
+out1:
+#if defined(AFS_LINUX26_ENV)
+ unlock_kernel();
+#endif
AFS_GUNLOCK();
- return 0;
+ return code;
}
-#ifdef NOTUSED
-int afs_linux_select(struct inode *ip, struct file *fp, int, select_table *);
-#endif
/* in afs_pioctl.c */
extern int afs_xioctl(struct inode *ip, struct file *fp, unsigned int com,
(void)afs_close(vcp, vmap->vm_file->f_flags, credp);
/* only decrement the execsOrWriters flag if this is not a
* writable file. */
- if (!(vmap->vm_file->f_flags & (FWRITE | FTRUNC)))
- vcp->execsOrWriters--;
+ if (!(vcp->states & CRO) )
+ if (! (vmap->vm_file->f_flags & (FWRITE | FTRUNC)))
+ vcp->execsOrWriters--;
vcp->states &= ~CMAPPED;
crfree(credp);
} else if ((vmap->vm_file->f_flags & (FWRITE | FTRUNC)))
/* Add an open reference on the first mapping. */
if (vcp->mapcnt == 0) {
- vcp->execsOrWriters++;
+ if (!(vcp->states & CRO))
+ vcp->execsOrWriters++;
vcp->opens++;
vcp->states |= CMAPPED;
}
}
-#ifdef NOTUSED
-/* No support for async i/o */
-int afs_linux_fasync(struct inode *ip, struct file *fp, int);
-
-/* I don't think it will, at least not as can be detected here. */
-int afs_linux_check_media_change(kdev_t dev);
-
-/* Revalidate media and file system. */
-int afs_linux_file_revalidate(kdev_t dev);
-#endif /* NOTUSED */
static int
afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
return -code;
}
+#if !defined(AFS_LINUX24_ENV)
/* Not allowed to directly read a directory. */
ssize_t
afs_linux_dir_read(struct file * fp, char *buf, size_t count, loff_t * ppos)
{
return -EISDIR;
}
+#endif
-#if defined(AFS_LINUX24_ENV)
struct file_operations afs_dir_fops = {
- read:generic_read_dir,
- readdir:afs_linux_readdir,
- ioctl:afs_xioctl,
- open:afs_linux_open,
- release:afs_linux_release,
-};
+#if !defined(AFS_LINUX24_ENV)
+ .read = afs_linux_dir_read,
+ .lock = afs_linux_lock,
+ .fsync = afs_linux_fsync,
#else
-struct file_operations afs_dir_fops = {
- NULL, /* afs_linux_lseek */
- afs_linux_dir_read,
- NULL, /* afs_linux_write */
- afs_linux_readdir,
- NULL, /* afs_linux_select */
- afs_xioctl, /* close enough to use the ported AFS one */
- NULL, /* afs_linux_mmap */
- afs_linux_open,
- NULL, /* afs_linux_flush */
- afs_linux_release,
- afs_linux_fsync,
- NULL, /* afs_linux_fasync */
- NULL, /* afs_linux_check_media_change */
- NULL, /* afs_linux_file_revalidate */
- afs_linux_lock,
-};
+ .read = generic_read_dir,
#endif
-
-#if defined(AFS_LINUX24_ENV)
-struct file_operations afs_file_fops = {
- read:afs_linux_read,
- write:afs_linux_write,
- ioctl:afs_xioctl,
- mmap:afs_linux_mmap,
- open:afs_linux_open,
- flush:afs_linux_flush,
- release:afs_linux_release,
- fsync:afs_linux_fsync,
- lock:afs_linux_lock,
+ .readdir = afs_linux_readdir,
+ .ioctl = afs_xioctl,
+ .open = afs_linux_open,
+ .release = afs_linux_release,
};
-#else
+
struct file_operations afs_file_fops = {
- NULL, /* afs_linux_lseek */
- afs_linux_read,
- afs_linux_write,
- NULL, /* afs_linux_readdir */
- NULL, /* afs_linux_select */
- afs_xioctl, /* close enough to use the ported AFS one */
- afs_linux_mmap,
- afs_linux_open,
- afs_linux_flush,
- afs_linux_release,
- afs_linux_fsync,
- NULL, /* afs_linux_fasync */
- NULL, /* afs_linux_check_media_change */
- NULL, /* afs_linux_file_revalidate */
- afs_linux_lock,
+ .read = afs_linux_read,
+ .write = afs_linux_write,
+ .ioctl = afs_xioctl,
+ .mmap = afs_linux_mmap,
+ .open = afs_linux_open,
+ .flush = afs_linux_flush,
+ .release = afs_linux_release,
+ .fsync = afs_linux_fsync,
+ .lock = afs_linux_lock,
};
-#endif
/**********************************************************************
return -code;
}
+#if defined(AFS_LINUX26_ENV)
+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;
+}
+#endif
/* 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
struct vcache *lookupvcp = NULL;
int code, bad_dentry = 1;
struct sysname_info sysState;
- struct vcache *vcp = ITOAFS(dp->d_inode);
- struct vcache *parentvcp = ITOAFS(dp->d_parent->d_inode);
+ struct vcache *vcp, *parentvcp;
+
+ sysState.allocked = 0;
AFS_GLOCK();
lock_kernel();
- sysState.allocked = 0;
+ vcp = ITOAFS(dp->d_inode);
+ parentvcp = ITOAFS(dp->d_parent->d_inode);
/* If it's a negative dentry, then there's nothing to do. */
if (!vcp || !parentvcp)
if (sysState.allocked)
osi_FreeLargeSpace(name);
- AFS_GUNLOCK();
- crfree(credp);
-
if (bad_dentry) {
shrink_dcache_parent(dp);
d_drop(dp);
}
+
unlock_kernel();
+ AFS_GUNLOCK();
+ crfree(credp);
return !bad_dentry;
}
+#if !defined(AFS_LINUX26_ENV)
/* afs_dentry_iput */
static void
afs_dentry_iput(struct dentry *dp, struct inode *ip)
osi_iput(ip);
}
+#endif
static int
afs_dentry_delete(struct dentry *dp)
return 0;
}
-#if defined(AFS_LINUX24_ENV)
-struct dentry_operations afs_dentry_operations = {
- d_revalidate:afs_linux_dentry_revalidate,
- d_iput:afs_dentry_iput,
- d_delete:afs_dentry_delete,
-};
-struct dentry_operations *afs_dops = &afs_dentry_operations;
-#else
struct dentry_operations afs_dentry_operations = {
- afs_linux_dentry_revalidate, /* d_validate(struct dentry *) */
- NULL, /* d_hash */
- NULL, /* d_compare */
- afs_dentry_delete, /* d_delete(struct dentry *) */
- NULL, /* d_release(struct dentry *) */
- afs_dentry_iput /* d_iput(struct dentry *, struct inode *) */
-};
-struct dentry_operations *afs_dops = &afs_dentry_operations;
+ .d_revalidate = afs_linux_dentry_revalidate,
+ .d_delete = afs_dentry_delete,
+#if !defined(AFS_LINUX26_ENV)
+ .d_iput = afs_dentry_iput,
#endif
+};
/**********************************************************************
* AFS Linux inode operations
vattr.va_mode = mode;
AFS_GLOCK();
+#if defined(AFS_LINUX26_ENV)
+ lock_kernel();
+#endif
code =
afs_create(ITOAFS(dip), name, &vattr, NONEXCL, mode,
(struct vcache **)&ip, credp);
ip->i_op = &afs_symlink_iops;
#endif
- dp->d_op = afs_dops;
+ dp->d_op = &afs_dentry_operations;
dp->d_time = jiffies;
d_instantiate(dp, ip);
}
+#if defined(AFS_LINUX26_ENV)
+ unlock_kernel();
+#endif
AFS_GUNLOCK();
crfree(credp);
return -code;
cred_t *credp = crref();
struct vcache *vcp = NULL;
const char *comp = dp->d_name.name;
+
AFS_GLOCK();
+#if defined(AFS_LINUX26_ENV)
+ lock_kernel();
+#endif
code = afs_lookup(ITOAFS(dip), comp, &vcp, credp);
if (vcp) {
#endif
}
dp->d_time = jiffies;
- dp->d_op = afs_dops;
+ dp->d_op = &afs_dentry_operations;
d_add(dp, AFSTOI(vcp));
+#if defined(AFS_LINUX26_ENV)
+ unlock_kernel();
+#endif
AFS_GUNLOCK();
crfree(credp);
const char *name = dp->d_name.name;
AFS_GLOCK();
+#if defined(AFS_LINUX26_ENV)
+ lock_kernel();
+#endif
code = afs_remove(ITOAFS(dip), name, credp);
- AFS_GUNLOCK();
if (!code)
d_drop(dp);
+#if defined(AFS_LINUX26_ENV)
+ lock_kernel();
+#endif
+ AFS_GUNLOCK();
crfree(credp);
return -code;
}
const char *name = dp->d_name.name;
AFS_GLOCK();
+#if defined(AFS_LINUX26_ENV)
+ lock_kernel();
+#endif
VATTR_NULL(&vattr);
vattr.va_mask = ATTR_MODE;
vattr.va_mode = mode;
#if defined(AFS_LINUX24_ENV)
tvcp->v.v_fop = &afs_dir_fops;
#endif
- dp->d_op = afs_dops;
+ 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;
const char *name = dp->d_name.name;
AFS_GLOCK();
+#if defined(AFS_LINUX26_ENV)
+ lock_kernel();
+#endif
code = afs_rmdir(ITOAFS(dip), name, credp);
/* Linux likes to see ENOTEMPTY returned from an rmdir() syscall
d_drop(dp);
}
+#if defined(AFS_LINUX26_ENV)
+ unlock_kernel();
+#endif
AFS_GUNLOCK();
crfree(credp);
return -code;
const char *oldname = olddp->d_name.name;
const char *newname = newdp->d_name.name;
+ AFS_GLOCK();
+#if defined(AFS_LINUX26_ENV)
+ lock_kernel();
+#endif
/* Remove old and new entries from name hash. New one will change below.
* While it's optimal to catch failures and re-insert newdp into hash,
* it's also error prone and in that case we're already dealing with error
* cases. Let another lookup put things right, if need be.
*/
- if (!list_empty(&olddp->d_hash)) {
+#if defined(AFS_LINUX26_ENV)
+ if (!d_unhashed(olddp))
d_drop(olddp);
- }
- if (!list_empty(&newdp->d_hash)) {
+ if (!d_unhashed(newdp))
d_drop(newdp);
- }
- AFS_GLOCK();
+#else
+ if (!list_empty(&olddp->d_hash))
+ d_drop(olddp);
+ if (!list_empty(&newdp->d_hash))
+ d_drop(newdp);
+#endif
code = afs_rename(ITOAFS(oldip), oldname, ITOAFS(newip), newname, credp);
- AFS_GUNLOCK();
if (!code) {
/* update time so it doesn't expire immediately */
d_move(olddp, newdp);
}
+#if defined(AFS_LINUX26_ENV)
+ unlock_kernel();
+#endif
+ AFS_GUNLOCK();
+
crfree(credp);
return -code;
}
}
#endif
-#ifdef NOTUSED
-/* afs_linux_bmap - supports generic_readpage, but we roll our own. */
-int
-afs_linux_bmap(struct inode *ip, int)
-{
- return -EINVAL;
-}
-
-/* afs_linux_truncate
- * Handles discarding disk blocks if this were a device. ext2 indicates we
- * may need to zero partial last pages of memory mapped files.
- */
-void
-afs_linux_truncate(struct inode *ip)
-{
-}
-#endif
-
/* afs_linux_permission
* Check access rights - returns error if can't check or permission denied.
*/
}
-#ifdef NOTUSED
-/* msdos sector mapping hack for memory mapping. */
-int
-afs_linux_smap(struct inode *ip, int)
-{
- return -EINVAL;
-}
-#endif
-
#if defined(AFS_LINUX24_ENV)
int
afs_linux_writepage_sync(struct inode *ip, struct page *pp,
extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp);
#endif
-#if defined(AFS_LINUX24_ENV)
struct inode_operations afs_file_iops = {
- revalidate:afs_linux_revalidate,
- setattr:afs_notify_change,
- permission:afs_linux_permission,
-};
-struct address_space_operations afs_file_aops = {
- readpage:afs_linux_readpage,
- writepage:afs_linux_writepage,
- commit_write:afs_linux_commit_write,
- prepare_write:afs_linux_prepare_write,
-};
-
-struct inode_operations *afs_ops = &afs_file_iops;
+#if defined(AFS_LINUX26_ENV)
+ .permission = afs_linux_permission,
+ .getattr = afs_linux_getattr,
+ .setattr = afs_notify_change,
+#elif defined(AFS_LINUX24_ENV)
+ .permission = afs_linux_permission,
+ .revalidate = afs_linux_revalidate,
+ .setattr = afs_notify_change,
#else
-struct inode_operations afs_iops = {
- &afs_file_fops, /* file operations */
- NULL, /* afs_linux_create */
- NULL, /* afs_linux_lookup */
- NULL, /* afs_linux_link */
- NULL, /* afs_linux_unlink */
- NULL, /* afs_linux_symlink */
- NULL, /* afs_linux_mkdir */
- NULL, /* afs_linux_rmdir */
- NULL, /* afs_linux_mknod */
- NULL, /* afs_linux_rename */
- NULL, /* afs_linux_readlink */
- NULL, /* afs_linux_follow_link */
- afs_linux_readpage,
- NULL, /* afs_linux_writepage */
- NULL, /* afs_linux_bmap */
- NULL, /* afs_linux_truncate */
- afs_linux_permission,
- NULL, /* afs_linux_smap */
- afs_linux_updatepage,
- afs_linux_revalidate,
+ .default_file_ops = &afs_file_fops,
+ .readpage = afs_linux_readpage,
+ .revalidate = afs_linux_revalidate,
+ .updatepage = afs_linux_updatepage,
+#endif
};
-struct inode_operations *afs_ops = &afs_iops;
+#if defined(AFS_LINUX24_ENV)
+struct address_space_operations afs_file_aops = {
+ .readpage = afs_linux_readpage,
+ .writepage = afs_linux_writepage,
+ .commit_write = afs_linux_commit_write,
+ .prepare_write = afs_linux_prepare_write,
+};
#endif
+
/* Separate ops vector for directories. Linux 2.2 tests type of inode
* by what sort of operation is allowed.....
*/
-#if defined(AFS_LINUX24_ENV)
+
struct inode_operations afs_dir_iops = {
- create:afs_linux_create,
- lookup:afs_linux_lookup,
- link:afs_linux_link,
- unlink:afs_linux_unlink,
- symlink:afs_linux_symlink,
- mkdir:afs_linux_mkdir,
- rmdir:afs_linux_rmdir,
- rename:afs_linux_rename,
- revalidate:afs_linux_revalidate,
- setattr:afs_notify_change,
- permission:afs_linux_permission,
-};
+#if !defined(AFS_LINUX24_ENV)
+ .default_file_ops = &afs_dir_fops,
#else
-struct inode_operations afs_dir_iops = {
- &afs_dir_fops, /* file operations for directories */
- afs_linux_create,
- afs_linux_lookup,
- afs_linux_link,
- afs_linux_unlink,
- afs_linux_symlink,
- afs_linux_mkdir,
- afs_linux_rmdir,
- NULL, /* afs_linux_mknod */
- afs_linux_rename,
- NULL, /* afs_linux_readlink */
- NULL, /* afs_linux_follow_link */
- NULL, /* afs_linux_readpage */
- NULL, /* afs_linux_writepage */
- NULL, /* afs_linux_bmap */
- NULL, /* afs_linux_truncate */
- afs_linux_permission,
- NULL, /* afs_linux_smap */
- NULL, /* afs_linux_updatepage */
- afs_linux_revalidate,
-};
+ .setattr = afs_notify_change,
#endif
+ .create = afs_linux_create,
+ .lookup = afs_linux_lookup,
+ .link = afs_linux_link,
+ .unlink = afs_linux_unlink,
+ .symlink = afs_linux_symlink,
+ .mkdir = afs_linux_mkdir,
+ .rmdir = afs_linux_rmdir,
+ .rename = afs_linux_rename,
+#if defined(AFS_LINUX26_ENV)
+ .getattr = afs_linux_getattr,
+#else
+ .revalidate = afs_linux_revalidate,
+#endif
+ .permission = afs_linux_permission,
+};
/* We really need a separate symlink set of ops, since do_follow_link()
* determines if it _is_ a link by checking if the follow_link op is set.
}
struct address_space_operations afs_symlink_aops = {
- readpage:afs_symlink_filler
+ .readpage = afs_symlink_filler
};
+#endif
struct inode_operations afs_symlink_iops = {
- readlink:page_readlink,
- follow_link:page_follow_link,
- setattr:afs_notify_change,
-};
+#if defined(AFS_LINUX24_ENV)
+ .readlink = page_readlink,
+ .follow_link = page_follow_link,
+ .setattr = afs_notify_change,
#else
-struct inode_operations afs_symlink_iops = {
- NULL, /* file operations */
- NULL, /* create */
- NULL, /* lookup */
- NULL, /* link */
- NULL, /* unlink */
- NULL, /* symlink */
- NULL, /* mkdir */
- NULL, /* rmdir */
- NULL, /* afs_linux_mknod */
- NULL, /* rename */
- afs_linux_readlink,
- afs_linux_follow_link,
- NULL, /* readpage */
- NULL, /* afs_linux_writepage */
- NULL, /* afs_linux_bmap */
- NULL, /* afs_linux_truncate */
- afs_linux_permission, /* tho the code appears to indicate not used? */
- NULL, /* afs_linux_smap */
- NULL, /* updatepage */
- afs_linux_revalidate, /* tho the code appears to indicate not used? */
-};
+ .readlink = afs_linux_readlink,
+ .follow_link = afs_linux_follow_link,
+ .permission = afs_linux_permission,
+ .revalidate = afs_linux_revalidate,
#endif
+};
git://git.openafs.org / openafs.git / blobdiff