diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/hypfs/inode.c | 6 | ||||
-rw-r--r-- | arch/s390/kernel/debug.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index bdade5f2e325..8735024d235b 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
@@ -104,13 +104,13 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) | |||
104 | 104 | ||
105 | static void hypfs_drop_inode(struct inode *inode) | 105 | static void hypfs_drop_inode(struct inode *inode) |
106 | { | 106 | { |
107 | kfree(inode->u.generic_ip); | 107 | kfree(inode->i_private); |
108 | generic_delete_inode(inode); | 108 | generic_delete_inode(inode); |
109 | } | 109 | } |
110 | 110 | ||
111 | static int hypfs_open(struct inode *inode, struct file *filp) | 111 | static int hypfs_open(struct inode *inode, struct file *filp) |
112 | { | 112 | { |
113 | char *data = filp->f_dentry->d_inode->u.generic_ip; | 113 | char *data = filp->f_dentry->d_inode->i_private; |
114 | struct hypfs_sb_info *fs_info; | 114 | struct hypfs_sb_info *fs_info; |
115 | 115 | ||
116 | if (filp->f_mode & FMODE_WRITE) { | 116 | if (filp->f_mode & FMODE_WRITE) { |
@@ -352,7 +352,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb, | |||
352 | parent->d_inode->i_nlink++; | 352 | parent->d_inode->i_nlink++; |
353 | } else | 353 | } else |
354 | BUG(); | 354 | BUG(); |
355 | inode->u.generic_ip = data; | 355 | inode->i_private = data; |
356 | d_instantiate(dentry, inode); | 356 | d_instantiate(dentry, inode); |
357 | dget(dentry); | 357 | dget(dentry); |
358 | return dentry; | 358 | return dentry; |
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index 7ba20922a535..43f3d0c7e132 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
@@ -603,7 +603,7 @@ debug_open(struct inode *inode, struct file *file) | |||
603 | debug_info_t *debug_info, *debug_info_snapshot; | 603 | debug_info_t *debug_info, *debug_info_snapshot; |
604 | 604 | ||
605 | down(&debug_lock); | 605 | down(&debug_lock); |
606 | debug_info = (struct debug_info*)file->f_dentry->d_inode->u.generic_ip; | 606 | debug_info = file->f_dentry->d_inode->i_private; |
607 | /* find debug view */ | 607 | /* find debug view */ |
608 | for (i = 0; i < DEBUG_MAX_VIEWS; i++) { | 608 | for (i = 0; i < DEBUG_MAX_VIEWS; i++) { |
609 | if (!debug_info->views[i]) | 609 | if (!debug_info->views[i]) |