#include <afsconfig.h>
#include "afs/param.h"
-RCSID
- ("$Header$");
#define __NO_VERSION__ /* don't define kernel_version in module.h */
#include <linux/module.h> /* early to avoid printf->printk mapping */
#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "afs/afs_stats.h"
-#if !defined(AFS_LINUX26_ENV)
-#include "h/locks.h"
-#endif
-#if defined(AFS_LINUX24_ENV)
-#include "h/smp_lock.h"
-#endif
+#include <linux/smp_lock.h>
+#include "osi_compat.h"
struct vcache *afs_globalVp = 0;
struct vfs *afs_globalVFS = 0;
-#if defined(AFS_LINUX24_ENV)
struct vfsmount *afs_cacheMnt;
-#endif
int afs_was_mounted = 0; /* Used to force reload if mount/unmount/mount */
extern struct super_operations afs_sops;
-#if defined(AFS_LINUX26_ENV)
+#if !defined(AFS_NONFSTRANS)
extern struct export_operations afs_export_ops;
#endif
extern afs_rwlock_t afs_xvcache;
* 2) Mount call comes to us via do_mount -> read_super -> afs_read_super.
* We are expected to setup the super_block. See afs_read_super.
*/
-#if defined(AFS_LINUX26_ENV)
-struct backing_dev_info afs_backing_dev_info = {
- .ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE,
- .state = 0,
-};
/* afs_read_super
* read the "super block" for AFS - roughly eguivalent to struct vfs.
* dev, covered, s_rd_only, s_dirt, and s_type will be set by read_super.
*/
-#if defined(AFS_LINUX26_ENV)
-static struct super_block *
#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
+static int
afs_get_sb(struct file_system_type *fs_type, int flags,
- const char *dev_name, void *data, struct vfsmount *mnt)
+ const char *dev_name, void *data, struct vfsmount *mnt) {
+ return get_sb_nodev(fs_type, flags, data, afs_fill_super, mnt);
+}
#else
+static struct superblock *
afs_get_sb(struct file_system_type *fs_type, int flags,
const char *dev_name, void *data)
-#endif
-{
-#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
- return get_sb_nodev(fs_type, flags, data, afs_fill_super, mnt);
-#else
return get_sb_nodev(fs_type, flags, data, afs_fill_super);
-#endif
}
-
+#endif
struct file_system_type afs_fs_type = {
.owner = THIS_MODULE,
.kill_sb = kill_anon_super,
.fs_flags = FS_BINARY_MOUNTDATA,
};
-#elif defined(AFS_LINUX24_ENV)
-DECLARE_FSTYPE(afs_fs_type, "afs", afs_read_super, 0);
-#else
-struct file_system_type afs_fs_type = {
- "afs", /* name - used by mount operation. */
- 0, /* requires_dev - no for network filesystems. mount() will
- * pass us an "unnamed" device. */
- afs_read_super, /* wrapper to afs_mount */
- NULL /* pointer to next file_system_type once registered. */
-};
-#endif
+struct backing_dev_info afs_backing_dev_info = {
+ .ra_pages = 32,
+};
int
afs_fill_super(struct super_block *sb, void *data, int silent)
-#else
-struct super_block *
-afs_read_super(struct super_block *sb, void *data, int silent)
-#endif
{
int code = 0;
printf
("You must reload the AFS kernel extensions before remounting AFS.\n");
AFS_GUNLOCK();
-#if defined(AFS_LINUX26_ENV)
return -EINVAL;
-#else
- return NULL;
-#endif
}
afs_was_mounted = 1;
/* Set basics of super_block */
-#if !defined(AFS_LINUX24_ENV)
- lock_super(sb);
-#endif
-#if defined(AFS_LINUX26_ENV)
__module_get(THIS_MODULE);
-#else
- MOD_INC_USE_COUNT;
-#endif
afs_globalVFS = sb;
sb->s_blocksize = 1024;
sb->s_blocksize_bits = 10;
sb->s_magic = AFS_VFSMAGIC;
sb->s_op = &afs_sops; /* Super block (vfs) ops */
-#if defined(AFS_LINUX26_ENV)
+#if defined(HAVE_BDI_INIT)
+ bdi_init(&afs_backing_dev_info);
+#endif
+#if defined (STRUCT_SUPER_BLOCK_HAS_S_BDI)
+ sb->s_bdi = &afs_backing_dev_info;
+ /* The name specified here will appear in the flushing thread name - flush-afs */
+ bdi_register(&afs_backing_dev_info, NULL, "afs");
+#endif
+#if !defined(AFS_NONFSTRANS)
sb->s_export_op = &afs_export_ops;
#endif
#if defined(MAX_NON_LFS)
code = afs_root(sb);
if (code) {
afs_globalVFS = NULL;
-#if defined(AFS_LINUX26_ENV)
+ osi_linux_free_inode_pages();
module_put(THIS_MODULE);
-#else
- MOD_DEC_USE_COUNT;
-#endif
}
-#if !defined(AFS_LINUX24_ENV)
- unlock_super(sb);
-#endif
-
AFS_GUNLOCK();
-#if defined(AFS_LINUX26_ENV)
return code ? -EINVAL : 0;
-#else
- return code ? NULL : sb;
-#endif
}
register struct vcache *tvp = 0;
AFS_STATCNT(afs_root);
- if (afs_globalVp && (afs_globalVp->states & CStatd)) {
+ if (afs_globalVp && (afs_globalVp->f.states & CStatd)) {
tvp = afs_globalVp;
} else {
cred_t *credp = crref();
/* setup super_block and mount point inode. */
afs_globalVp = tvp;
-#if defined(AFS_LINUX24_ENV)
afsp->s_root = d_alloc_root(ip);
-#else
- afsp->s_root = d_alloc_root(ip, NULL);
-#endif
afsp->s_root->d_op = &afs_dentry_operations;
} else
code = ENOENT;
VATTR_NULL(&vattr);
iattr2vattr(&vattr, iattrp); /* Convert for AFS vnodeops call. */
-#if defined(AFS_LINUX26_ENV)
lock_kernel();
-#endif
AFS_GLOCK();
code = afs_setattr(VTOAFS(ip), &vattr, credp);
if (!code) {
vattr2inode(ip, &vattr);
}
AFS_GUNLOCK();
-#if defined(AFS_LINUX26_ENV)
unlock_kernel();
-#endif
crfree(credp);
return -code;
}
#if defined(STRUCT_SUPER_HAS_ALLOC_INODE)
-static kmem_cache_t *afs_inode_cachep;
+static afs_kmem_cache_t *afs_inode_cachep;
static struct inode *
afs_alloc_inode(struct super_block *sb)
{
struct vcache *vcp;
- vcp = (struct vcache *) kmem_cache_alloc(afs_inode_cachep, SLAB_KERNEL);
+ vcp = (struct vcache *) kmem_cache_alloc(afs_inode_cachep, KALLOC_TYPE);
if (!vcp)
return NULL;
kmem_cache_free(afs_inode_cachep, inode);
}
-static void
-init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
+void
+init_once(void * foo)
{
struct vcache *vcp = (struct vcache *) foo;
- if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
- SLAB_CTOR_CONSTRUCTOR)
- inode_init_once(AFSTOV(vcp));
+ inode_init_once(AFSTOV(vcp));
}
int
afs_init_inodecache(void)
{
-#ifndef SLAB_RECLAIM_ACCOUNT
-#define SLAB_RECLAIM_ACCOUNT 0
-#endif
-
+#if defined(KMEM_CACHE_TAKES_DTOR)
afs_inode_cachep = kmem_cache_create("afs_inode_cache",
- sizeof(struct vcache),
- 0, SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT,
- init_once, NULL);
+ sizeof(struct vcache), 0,
+ SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT, init_once_func, NULL);
+#else
+ afs_inode_cachep = kmem_cache_create("afs_inode_cache",
+ sizeof(struct vcache), 0,
+ SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT, init_once_func);
+#endif
if (afs_inode_cachep == NULL)
return -ENOMEM;
return 0;
void
afs_destroy_inodecache(void)
{
- if (kmem_cache_destroy(afs_inode_cachep))
- printk(KERN_INFO "afs_inode_cache: not all structures were freed\n");
+ if (afs_inode_cachep)
+ (void) kmem_cache_destroy(afs_inode_cachep);
}
#else
int
AFS_GLOCK();
AFS_STATCNT(afs_unmount);
-#if !defined(AFS_LINUX26_ENV)
- if (!suser()) {
- AFS_GUNLOCK();
- return;
- }
-#endif
-
afs_globalVFS = 0;
afs_globalVp = 0;
osi_linux_free_inode_pages(); /* invalidate and release remaining AFS inodes. */
afs_shutdown();
-#if defined(AFS_LINUX24_ENV)
mntput(afs_cacheMnt);
-#endif
osi_linux_verify_alloced_memory();
+#if defined(HAVE_BDI_INIT)
+ bdi_destroy(&afs_backing_dev_info);
+#endif
AFS_GUNLOCK();
sbp->s_dev = 0;
-#if defined(AFS_LINUX26_ENV)
module_put(THIS_MODULE);
-#else
- MOD_DEC_USE_COUNT;
-#endif
}
* statp is in user space, so we need to cobble together a statfs, then
* copy it.
*/
-#if defined(AFS_LINUX26_ENV)
-int
-afs_statfs(struct super_block *sbp, struct kstatfs *statp)
-#elif defined(AFS_LINUX24_ENV)
int
-afs_statfs(struct super_block *sbp, struct statfs *statp)
+#if defined(STATFS_TAKES_DENTRY)
+afs_statfs(struct dentry *dentry, struct kstatfs *statp)
#else
-int
-afs_statfs(struct super_block *sbp, struct statfs *__statp, int size)
+afs_statfs(struct super_block *sbp, struct kstatfs *statp)
#endif
{
-#if !defined(AFS_LINUX24_ENV)
- struct statfs stat, *statp;
-
- if (size < sizeof(struct statfs))
- return;
-
- memset(&stat, 0, size);
- statp = &stat;
-#else
memset(statp, 0, sizeof(*statp));
-#endif
AFS_STATCNT(afs_statfs);
- statp->f_type = 0; /* Can we get a real type sometime? */
+ /* hardcode in case that which is giveth is taken away */
+ statp->f_type = 0x5346414F;
+#if defined(STATFS_TAKES_DENTRY)
+ statp->f_bsize = dentry->d_sb->s_blocksize;
+#else
statp->f_bsize = sbp->s_blocksize;
+#endif
statp->f_blocks = statp->f_bfree = statp->f_bavail = statp->f_files =
statp->f_ffree = 9000000;
statp->f_fsid.val[0] = AFS_VFSMAGIC;
statp->f_fsid.val[1] = AFS_VFSFSID;
statp->f_namelen = 256;
-#if !defined(AFS_LINUX24_ENV)
- memcpy_tofs(__statp, &stat, size);
-#endif
return 0;
}
.clear_inode = afs_clear_inode,
.put_super = afs_put_super,
.statfs = afs_statfs,
-#if !defined(AFS_LINUX24_ENV)
- .notify_change = afs_notify_change,
-#endif
};
/************** Support routines ************************/
if (iattrp->ia_valid & ATTR_SIZE)
vattrp->va_size = iattrp->ia_size;
if (iattrp->ia_valid & ATTR_ATIME) {
-#if defined(AFS_LINUX26_ENV)
vattrp->va_atime.tv_sec = iattrp->ia_atime.tv_sec;
-#else
- vattrp->va_atime.tv_sec = iattrp->ia_atime;
-#endif
vattrp->va_atime.tv_usec = 0;
}
if (iattrp->ia_valid & ATTR_MTIME) {
-#if defined(AFS_LINUX26_ENV)
vattrp->va_mtime.tv_sec = iattrp->ia_mtime.tv_sec;
-#else
- vattrp->va_mtime.tv_sec = iattrp->ia_mtime;
-#endif
vattrp->va_mtime.tv_usec = 0;
}
if (iattrp->ia_valid & ATTR_CTIME) {
-#if defined(AFS_LINUX26_ENV)
vattrp->va_ctime.tv_sec = iattrp->ia_ctime.tv_sec;
-#else
- vattrp->va_ctime.tv_sec = iattrp->ia_ctime;
-#endif
vattrp->va_ctime.tv_usec = 0;
}
}
ip->i_ino = vp->va_nodeid;
ip->i_nlink = vp->va_nlink;
ip->i_blocks = vp->va_blocks;
+#ifdef STRUCT_INODE_HAS_I_BLKBITS
+ ip->i_blkbits = AFS_BLKBITS;
+#endif
#ifdef STRUCT_INODE_HAS_I_BLKSIZE
ip->i_blksize = vp->va_blocksize;
#endif
ip->i_mode = vp->va_mode;
ip->i_uid = vp->va_uid;
ip->i_gid = vp->va_gid;
- ip->i_size = vp->va_size;
-#if defined(AFS_LINUX26_ENV)
+ i_size_write(ip, vp->va_size);
ip->i_atime.tv_sec = vp->va_atime.tv_sec;
+ ip->i_atime.tv_nsec = 0;
ip->i_mtime.tv_sec = vp->va_mtime.tv_sec;
/* Set the mtime nanoseconds to the sysname generation number.
* This convinces NFS clients that all directories have changed
*/
ip->i_mtime.tv_nsec = afs_sysnamegen;
ip->i_ctime.tv_sec = vp->va_ctime.tv_sec;
-#else
- ip->i_atime = vp->va_atime.tv_sec;
- ip->i_mtime = vp->va_mtime.tv_sec;
- ip->i_ctime = vp->va_ctime.tv_sec;
-#endif
+ ip->i_ctime.tv_nsec = 0;
}
/* osi_linux_free_inode_pages