projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] pi-futex: introduce WARN_ON_SMP
[powerpc.git]
/
fs
/
freevxfs
/
vxfs_super.c
diff --git
a/fs/freevxfs/vxfs_super.c
b/fs/freevxfs/vxfs_super.c
index
6aa6fbe
..
b74b791
100644
(file)
--- a/
fs/freevxfs/vxfs_super.c
+++ b/
fs/freevxfs/vxfs_super.c
@@
-40,6
+40,7
@@
#include <linux/slab.h>
#include <linux/stat.h>
#include <linux/vfs.h>
#include <linux/slab.h>
#include <linux/stat.h>
#include <linux/vfs.h>
+#include <linux/mount.h>
#include "vxfs.h"
#include "vxfs_extern.h"
#include "vxfs.h"
#include "vxfs_extern.h"
@@
-55,7
+56,7
@@
MODULE_ALIAS("vxfs"); /* makes mount -t vxfs autoload the module */
static void vxfs_put_super(struct super_block *);
static void vxfs_put_super(struct super_block *);
-static int vxfs_statfs(struct
super_block
*, struct kstatfs *);
+static int vxfs_statfs(struct
dentry
*, struct kstatfs *);
static int vxfs_remount(struct super_block *, int *, char *);
static struct super_operations vxfs_super_ops = {
static int vxfs_remount(struct super_block *, int *, char *);
static struct super_operations vxfs_super_ops = {
@@
-90,12
+91,12
@@
vxfs_put_super(struct super_block *sbp)
/**
* vxfs_statfs - get filesystem information
/**
* vxfs_statfs - get filesystem information
- * @
sbp: VFS
superblock
+ * @
dentry: VFS dentry to locate
superblock
* @bufp: output buffer
*
* Description:
* vxfs_statfs fills the statfs buffer @bufp with information
* @bufp: output buffer
*
* Description:
* vxfs_statfs fills the statfs buffer @bufp with information
- * about the filesystem described by @
sbp
.
+ * about the filesystem described by @
dentry
.
*
* Returns:
* Zero.
*
* Returns:
* Zero.
@@
-107,12
+108,12
@@
vxfs_put_super(struct super_block *sbp)
* This is everything but complete...
*/
static int
* This is everything but complete...
*/
static int
-vxfs_statfs(struct
super_block *sbp
, struct kstatfs *bufp)
+vxfs_statfs(struct
dentry *dentry
, struct kstatfs *bufp)
{
{
- struct vxfs_sb_info *infp = VXFS_SBI(
sbp
);
+ struct vxfs_sb_info *infp = VXFS_SBI(
dentry->d_sb
);
bufp->f_type = VXFS_SUPER_MAGIC;
bufp->f_type = VXFS_SUPER_MAGIC;
- bufp->f_bsize =
sbp
->s_blocksize;
+ bufp->f_bsize =
dentry->d_sb
->s_blocksize;
bufp->f_blocks = infp->vsi_raw->vs_dsize;
bufp->f_bfree = infp->vsi_raw->vs_free;
bufp->f_bavail = 0;
bufp->f_blocks = infp->vsi_raw->vs_dsize;
bufp->f_bfree = infp->vsi_raw->vs_free;
bufp->f_bavail = 0;
@@
-241,10
+242,11
@@
out:
/*
* The usual module blurb.
*/
/*
* The usual module blurb.
*/
-static
struct super_block *
vxfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
vxfs_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
{
{
- return get_sb_bdev(fs_type, flags, dev_name, data, vxfs_fill_super);
+ return get_sb_bdev(fs_type, flags, dev_name, data, vxfs_fill_super,
+ mnt);
}
static struct file_system_type vxfs_fs_type = {
}
static struct file_system_type vxfs_fs_type = {
@@
-260,7
+262,7
@@
vxfs_init(void)
{
vxfs_inode_cachep = kmem_cache_create("vxfs_inode",
sizeof(struct vxfs_inode_info), 0,
{
vxfs_inode_cachep = kmem_cache_create("vxfs_inode",
sizeof(struct vxfs_inode_info), 0,
- SLAB_RECLAIM_ACCOUNT, NULL, NULL);
+ SLAB_RECLAIM_ACCOUNT
|SLAB_MEM_SPREAD
, NULL, NULL);
if (vxfs_inode_cachep)
return register_filesystem(&vxfs_fs_type);
return -ENOMEM;
if (vxfs_inode_cachep)
return register_filesystem(&vxfs_fs_type);
return -ENOMEM;