@@ -104,7 +104,7 @@ static void show_faulting_vma(unsigned long address, char *buf)
if (file) {
nm = file_path(file, buf, PAGE_SIZE - 1);
inode = file_inode(vma->vm_file);
- dev = inode->i_sb->s_dev;
+ dev = inode_sb(inode)->s_dev;
ino = inode->i_ino;
}
pr_info(" @off 0x%lx in [%s]\n"
@@ -251,7 +251,7 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
struct inode *inode;
struct spu_context *ctx;
- inode = spufs_new_inode(dir->i_sb, mode | S_IFDIR);
+ inode = spufs_new_inode(inode_sb(dir), mode | S_IFDIR);
if (!inode)
return -ENOSPC;
@@ -284,7 +284,7 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
else
ret = spufs_fill_dir(dentry, spufs_dir_contents, mode, ctx);
- if (!ret && spufs_get_sb_info(dir->i_sb)->debug)
+ if (!ret && spufs_get_sb_info(inode_sb(dir))->debug)
ret = spufs_fill_dir(dentry, spufs_dir_debug_contents,
mode, ctx);
@@ -484,7 +484,7 @@ spufs_mkgang(struct inode *dir, struct dentry *dentry, umode_t mode)
struct spu_gang *gang;
ret = -ENOSPC;
- inode = spufs_new_inode(dir->i_sb, mode | S_IFDIR);
+ inode = spufs_new_inode(inode_sb(dir), mode | S_IFDIR);
if (!inode)
goto out;
@@ -128,7 +128,7 @@ static int hypfs_open(struct inode *inode, struct file *filp)
return -EACCES;
}
- fs_info = inode->i_sb->s_fs_info;
+ fs_info = inode_sb(inode)->s_fs_info;
if(data) {
mutex_lock(&fs_info->lock);
filp->private_data = kstrdup(data, GFP_KERNEL);
@@ -164,7 +164,7 @@ static ssize_t hypfs_read_iter(struct kiocb *iocb, struct iov_iter *to)
static ssize_t hypfs_write_iter(struct kiocb *iocb, struct iov_iter *from)
{
int rc;
- struct super_block *sb = file_inode(iocb->ki_filp)->i_sb;
+ struct super_block *sb = inode_sb(file_inode(iocb->ki_filp));
struct hypfs_sb_info *fs_info = sb->s_fs_info;
size_t count = iov_iter_count(from);
Signed-off-by: Mark Fasheh <mfasheh@suse.de> --- arch/arc/kernel/troubleshoot.c | 2 +- arch/powerpc/platforms/cell/spufs/inode.c | 6 +++--- arch/s390/hypfs/inode.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)