#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "afs/afs_stats.h"
-#include <linux/smp_lock.h>
#include "osi_compat.h"
/* Forward declarations */
static void iattr2vattr(struct vattr *vattrp, struct iattr *iattrp);
static int afs_root(struct super_block *afsp);
-struct super_block *afs_read_super(struct super_block *sb, void *data, int silent);
int afs_fill_super(struct super_block *sb, void *data, int silent);
-/* afs_file_system
- * VFS entry for Linux - installed in init_module
- * Linux mounts file systems by:
- * 1) register_filesystem(&afs_file_system) - done in init_module
- * 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.
- */
-
-/* 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.
+/*
+ * afs_mount (2.6.37+) and afs_get_sb (2.6.36-) are the entry
+ * points from the vfs when mounting afs. The super block
+ * structure is setup in the afs_fill_super callback function.
*/
-#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
+
+#if defined(STRUCT_FILE_SYSTEM_TYPE_HAS_MOUNT)
+static struct dentry *
+afs_mount(struct file_system_type *fs_type, int flags,
+ const char *dev_name, void *data) {
+ return mount_nodev(fs_type, flags, data, afs_fill_super);
+}
+#elif defined(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) {
return get_sb_nodev(fs_type, flags, data, afs_fill_super, mnt);
}
#else
-static struct superblock *
+static struct super_block *
afs_get_sb(struct file_system_type *fs_type, int flags,
const char *dev_name, void *data) {
return get_sb_nodev(fs_type, flags, data, afs_fill_super);
struct file_system_type afs_fs_type = {
.owner = THIS_MODULE,
.name = "afs",
+#if defined(STRUCT_FILE_SYSTEM_TYPE_HAS_MOUNT)
+ .mount = afs_mount,
+#else
.get_sb = afs_get_sb,
+#endif
.kill_sb = kill_anon_super,
.fs_flags = FS_BINARY_MOUNTDATA,
};
sb->s_blocksize_bits = 10;
sb->s_magic = AFS_VFSMAGIC;
sb->s_op = &afs_sops; /* Super block (vfs) ops */
+
+#if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
+ sb->s_d_op = &afs_dentry_operations;
+#endif
+
/* used for inodes backing_dev_info field, also */
- afs_backing_dev_info = osi_Alloc(sizeof(struct backing_dev_info));
+ afs_backing_dev_info = kmalloc(sizeof(struct backing_dev_info), GFP_NOFS);
#if defined(HAVE_LINUX_BDI_INIT)
bdi_init(afs_backing_dev_info);
#endif
code = afs_root(sb);
if (code) {
afs_globalVFS = NULL;
- osi_linux_free_inode_pages();
+ afs_FlushAllVCaches();
module_put(THIS_MODULE);
}
static int
afs_root(struct super_block *afsp)
{
- register afs_int32 code = 0;
+ afs_int32 code = 0;
struct vrequest treq;
- register struct vcache *tvp = 0;
+ struct vcache *tvp = 0;
AFS_STATCNT(afs_root);
if (afs_globalVp && (afs_globalVp->f.states & CStatd)) {
/* setup super_block and mount point inode. */
afs_globalVp = tvp;
afsp->s_root = d_alloc_root(ip);
+#if !defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
afsp->s_root->d_op = &afs_dentry_operations;
+#endif
} else
code = ENOENT;
}
afs_globalVFS = 0;
afs_globalVp = 0;
- osi_linux_free_inode_pages(); /* invalidate and release remaining AFS inodes. */
afs_shutdown();
mntput(afs_cacheMnt);
#if defined(HAVE_LINUX_BDI_INIT)
bdi_destroy(afs_backing_dev_info);
#endif
- osi_Free(afs_backing_dev_info, sizeof(struct backing_dev_info));
+ kfree(afs_backing_dev_info);
AFS_GUNLOCK();
sbp->s_dev = 0;
ip->i_ctime.tv_sec = vp->va_ctime.tv_sec;
ip->i_ctime.tv_nsec = 0;
}
-
-/* osi_linux_free_inode_pages
- *
- * Free all vnodes remaining in the afs hash. Must be done before
- * shutting down afs and freeing all memory.
- */
-void
-osi_linux_free_inode_pages(void)
-{
- int i;
- struct vcache *tvc, *nvc;
- extern struct vcache *afs_vhashT[VCSIZE];
-
- for (i = 0; i < VCSIZE; i++) {
- for (tvc = afs_vhashT[i]; tvc; ) {
- int slept;
-
- nvc = tvc->hnext;
- if (afs_FlushVCache(tvc, &slept)) /* slept always 0 for linux? */
- printf("Failed to invalidate all pages on inode 0x%p\n", tvc);
- tvc = nvc;
- }
- }
-}