git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
fs
/
udf
/
super.c
diff --git
a/fs/udf/super.c
b/fs/udf/super.c
index
fcce1a2
..
73fc0d8
100644
(file)
--- a/
fs/udf/super.c
+++ b/
fs/udf/super.c
@@
-40,6
+40,7
@@
#include "udfdecl.h"
#include "udfdecl.h"
+#include <linux/config.h>
#include <linux/blkdev.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/blkdev.h>
#include <linux/slab.h>
#include <linux/kernel.h>
@@
-90,13
+91,13
@@
static void udf_load_partdesc(struct super_block *, struct buffer_head *);
static void udf_open_lvid(struct super_block *);
static void udf_close_lvid(struct super_block *);
static unsigned int udf_count_free(struct super_block *);
static void udf_open_lvid(struct super_block *);
static void udf_close_lvid(struct super_block *);
static unsigned int udf_count_free(struct super_block *);
-static int udf_statfs(struct
dentry
*, struct kstatfs *);
+static int udf_statfs(struct
super_block
*, struct kstatfs *);
/* UDF filesystem type */
/* UDF filesystem type */
-static
int
udf_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
+static
struct super_block *
udf_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data)
{
{
- return get_sb_bdev(fs_type, flags, dev_name, data, udf_fill_super
, mnt
);
+ return get_sb_bdev(fs_type, flags, dev_name, data, udf_fill_super);
}
static struct file_system_type udf_fstype = {
}
static struct file_system_type udf_fstype = {
@@
-115,13
+116,6
@@
static struct inode *udf_alloc_inode(struct super_block *sb)
ei = (struct udf_inode_info *)kmem_cache_alloc(udf_inode_cachep, SLAB_KERNEL);
if (!ei)
return NULL;
ei = (struct udf_inode_info *)kmem_cache_alloc(udf_inode_cachep, SLAB_KERNEL);
if (!ei)
return NULL;
-
- ei->i_unique = 0;
- ei->i_lenExtents = 0;
- ei->i_next_alloc_block = 0;
- ei->i_next_alloc_goal = 0;
- ei->i_strat4096 = 0;
-
return &ei->vfs_inode;
}
return &ei->vfs_inode;
}
@@
-1785,10
+1779,8
@@
udf_put_super(struct super_block *sb)
* Written, tested, and released.
*/
static int
* Written, tested, and released.
*/
static int
-udf_statfs(struct
dentry *dentry
, struct kstatfs *buf)
+udf_statfs(struct
super_block *sb
, struct kstatfs *buf)
{
{
- struct super_block *sb = dentry->d_sb;
-
buf->f_type = UDF_SUPER_MAGIC;
buf->f_bsize = sb->s_blocksize;
buf->f_blocks = UDF_SB_PARTLEN(sb, UDF_SB_PARTITION(sb));
buf->f_type = UDF_SUPER_MAGIC;
buf->f_bsize = sb->s_blocksize;
buf->f_blocks = UDF_SB_PARTLEN(sb, UDF_SB_PARTITION(sb));