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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
coda
/
inode.c
diff --git
a/fs/coda/inode.c
b/fs/coda/inode.c
index
ada1a81
..
87f1dc8
100644
(file)
--- a/
fs/coda/inode.c
+++ b/
fs/coda/inode.c
@@
-36,7
+36,7
@@
/* VFS super_block ops */
static void coda_clear_inode(struct inode *);
static void coda_put_super(struct super_block *);
/* VFS super_block ops */
static void coda_clear_inode(struct inode *);
static void coda_put_super(struct super_block *);
-static int coda_statfs(struct
super_block *sb
, struct kstatfs *buf);
+static int coda_statfs(struct
dentry *dentry
, struct kstatfs *buf);
static kmem_cache_t * coda_inode_cachep;
static kmem_cache_t * coda_inode_cachep;
@@
-278,13
+278,13
@@
struct inode_operations coda_file_inode_operations = {
.setattr = coda_setattr,
};
.setattr = coda_setattr,
};
-static int coda_statfs(struct
super_block *sb
, struct kstatfs *buf)
+static int coda_statfs(struct
dentry *dentry
, struct kstatfs *buf)
{
int error;
lock_kernel();
{
int error;
lock_kernel();
- error = venus_statfs(
sb
, buf);
+ error = venus_statfs(
dentry
, buf);
unlock_kernel();
unlock_kernel();
@@
-307,10
+307,10
@@
static int coda_statfs(struct super_block *sb, struct kstatfs *buf)
/* init_coda: used by filesystems.c to register coda */
/* init_coda: used by filesystems.c to register coda */
-static
struct super_block *
coda_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
coda_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, coda_fill_super);
+ return get_sb_nodev(fs_type, flags, data, coda_fill_super
, mnt
);
}
struct file_system_type coda_fs_type = {
}
struct file_system_type coda_fs_type = {