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_LINUX26_ENV) && !defined(AFS_NONFSTRANS)
extern struct export_operations afs_export_ops;
#endif
extern afs_rwlock_t afs_xvcache;
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(AFS_LINUX26_ENV) && !defined(AFS_NONFSTRANS)
sb->s_export_op = &afs_export_ops;
#endif
#if defined(MAX_NON_LFS)
#if defined(STRUCT_SUPER_HAS_ALLOC_INODE)
+#if defined(HAVE_KMEM_CACHE_T)
static kmem_cache_t *afs_inode_cachep;
+#else
+struct kmem_cache *afs_inode_cachep;
+#endif
static struct inode *
afs_alloc_inode(struct super_block *sb)
{
struct vcache *vcp;
+#if defined(SLAB_KERNEL)
vcp = (struct vcache *) kmem_cache_alloc(afs_inode_cachep, SLAB_KERNEL);
+#else
+ vcp = (struct vcache *) kmem_cache_alloc(afs_inode_cachep, GFP_KERNEL);
+#endif
if (!vcp)
return NULL;
}
static void
+#if defined(HAVE_KMEM_CACHE_T)
init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
+#else
+#if defined(KMEM_CACHE_INIT)
+init_once(struct kmem_cache * cachep, void * foo)
+#else
+init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
+#endif
+#endif
{
struct vcache *vcp = (struct vcache *) foo;
+#if defined(SLAB_CTOR_VERIFY)
if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
SLAB_CTOR_CONSTRUCTOR)
+#endif
inode_init_once(AFSTOV(vcp));
}
#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);
+#else
+ afs_inode_cachep = kmem_cache_create("afs_inode_cache",
+ sizeof(struct vcache),
+ 0, SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT,
+ init_once);
+#endif
if (afs_inode_cachep == NULL)
return -ENOMEM;
return 0;
void
afs_destroy_inodecache(void)
{
- (void) kmem_cache_destroy(afs_inode_cachep);
+ if (afs_inode_cachep)
+ (void) kmem_cache_destroy(afs_inode_cachep);
}
#else
int
#endif
osi_linux_verify_alloced_memory();
+#if defined(HAVE_BDI_INIT)
+ bdi_destroy(&afs_backing_dev_info);
+#endif
AFS_GUNLOCK();
sbp->s_dev = 0;
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
ip->i_size = vp->va_size;
#if defined(AFS_LINUX26_ENV)
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;
+ ip->i_ctime.tv_nsec = 0;
#else
ip->i_atime = vp->va_atime.tv_sec;
ip->i_mtime = vp->va_mtime.tv_sec;