diff options
Diffstat (limited to 'fs/hostfs/hostfs_kern.c')
-rw-r--r-- | fs/hostfs/hostfs_kern.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 2f72da5ae686..e130bd46d671 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
@@ -250,7 +250,6 @@ static void hostfs_evict_inode(struct inode *inode) | |||
250 | static void hostfs_i_callback(struct rcu_head *head) | 250 | static void hostfs_i_callback(struct rcu_head *head) |
251 | { | 251 | { |
252 | struct inode *inode = container_of(head, struct inode, i_rcu); | 252 | struct inode *inode = container_of(head, struct inode, i_rcu); |
253 | INIT_LIST_HEAD(&inode->i_dentry); | ||
254 | kfree(HOSTFS_I(inode)); | 253 | kfree(HOSTFS_I(inode)); |
255 | } | 254 | } |
256 | 255 | ||
@@ -259,9 +258,9 @@ static void hostfs_destroy_inode(struct inode *inode) | |||
259 | call_rcu(&inode->i_rcu, hostfs_i_callback); | 258 | call_rcu(&inode->i_rcu, hostfs_i_callback); |
260 | } | 259 | } |
261 | 260 | ||
262 | static int hostfs_show_options(struct seq_file *seq, struct vfsmount *vfs) | 261 | static int hostfs_show_options(struct seq_file *seq, struct dentry *root) |
263 | { | 262 | { |
264 | const char *root_path = vfs->mnt_sb->s_fs_info; | 263 | const char *root_path = root->d_sb->s_fs_info; |
265 | size_t offset = strlen(root_ino) + 1; | 264 | size_t offset = strlen(root_ino) + 1; |
266 | 265 | ||
267 | if (strlen(root_path) > offset) | 266 | if (strlen(root_path) > offset) |
@@ -552,7 +551,7 @@ static int read_name(struct inode *ino, char *name) | |||
552 | return 0; | 551 | return 0; |
553 | } | 552 | } |
554 | 553 | ||
555 | int hostfs_create(struct inode *dir, struct dentry *dentry, int mode, | 554 | int hostfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, |
556 | struct nameidata *nd) | 555 | struct nameidata *nd) |
557 | { | 556 | { |
558 | struct inode *inode; | 557 | struct inode *inode; |
@@ -677,7 +676,7 @@ int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to) | |||
677 | return err; | 676 | return err; |
678 | } | 677 | } |
679 | 678 | ||
680 | int hostfs_mkdir(struct inode *ino, struct dentry *dentry, int mode) | 679 | int hostfs_mkdir(struct inode *ino, struct dentry *dentry, umode_t mode) |
681 | { | 680 | { |
682 | char *file; | 681 | char *file; |
683 | int err; | 682 | int err; |
@@ -701,7 +700,7 @@ int hostfs_rmdir(struct inode *ino, struct dentry *dentry) | |||
701 | return err; | 700 | return err; |
702 | } | 701 | } |
703 | 702 | ||
704 | int hostfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) | 703 | static int hostfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) |
705 | { | 704 | { |
706 | struct inode *inode; | 705 | struct inode *inode; |
707 | char *name; | 706 | char *name; |