[61/76] fs/qnx6: Use inode_sb() helper instead of inode->i_sb

Commit Message

Mark Fasheh May 8, 2018, 6:04 p.m. UTC

Signed-off-by: Mark Fasheh <[e-mail]>
---
 fs/qnx6/dir.c   | 8 ++++----
 fs/qnx6/inode.c | 4 ++--
 fs/qnx6/namei.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c
index c1cfb8a19e9d..655d0eb9d82a 100644
--- a/fs/qnx6/dir.c
+++ b/fs/qnx6/dir.c
@@ -65,7 +65,7 @@  static int qnx6_dir_longfilename(struct inode *inode,
 			unsigned de_inode)
 {
 	struct qnx6_long_filename *lf;
-	struct super_block *s = inode->i_sb;
+	struct super_block *s = inode_sb(inode);
 	struct qnx6_sb_info *sbi = QNX6_SB(s);
 	struct page *page;
 	int lf_size;
@@ -112,7 +112,7 @@  static int qnx6_dir_longfilename(struct inode *inode,
 static int qnx6_readdir(struct file *file, struct dir_context *ctx)
 {
 	struct inode *inode = file_inode(file);
-	struct super_block *s = inode->i_sb;
+	struct super_block *s = inode_sb(inode);
 	struct qnx6_sb_info *sbi = QNX6_SB(s);
 	loff_t pos = ctx->pos & ~(QNX6_DIR_ENTRY_SIZE - 1);
 	unsigned long npages = dir_pages(inode);
@@ -175,7 +175,7 @@  static int qnx6_readdir(struct file *file, struct dir_context *ctx)
 static unsigned qnx6_long_match(int len, const char *name,
 			struct qnx6_long_dir_entry *de, struct inode *dir)
 {
-	struct super_block *s = dir->i_sb;
+	struct super_block *s = inode_sb(dir);
 	struct qnx6_sb_info *sbi = QNX6_SB(s);
 	struct page *page;
 	int thislen;
@@ -213,7 +213,7 @@  static unsigned qnx6_match(struct super_block *s, int len, const char *name,
 unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,
 			 struct page **res_page)
 {
-	struct super_block *s = dir->i_sb;
+	struct super_block *s = inode_sb(dir);
 	struct qnx6_inode_info *ei = QNX6_I(dir);
 	struct page *page = NULL;
 	unsigned long start, n;
diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c
index 4aeb26bcb4d0..4be77b89f11d 100644
--- a/fs/qnx6/inode.c
+++ b/fs/qnx6/inode.c
@@ -79,7 +79,7 @@  static int qnx6_get_block(struct inode *inode, sector_t iblock,
 	phys = qnx6_block_map(inode, iblock);
 	if (phys) {
 		/* logical block is before EOF */
-		map_bh(bh, inode->i_sb, phys);
+		map_bh(bh, inode_sb(inode), phys);
 	}
 	return 0;
 }
@@ -110,7 +110,7 @@  static int qnx6_readpages(struct file *file, struct address_space *mapping,
  */
 static unsigned qnx6_block_map(struct inode *inode, unsigned no)
 {
-	struct super_block *s = inode->i_sb;
+	struct super_block *s = inode_sb(inode);
 	struct qnx6_sb_info *sbi = QNX6_SB(s);
 	struct qnx6_inode_info *ei = QNX6_I(inode);
 	unsigned block = 0;
diff --git a/fs/qnx6/namei.c b/fs/qnx6/namei.c
index 72c2770830be..0b1a626c20d8 100644
--- a/fs/qnx6/namei.c
+++ b/fs/qnx6/namei.c
@@ -27,7 +27,7 @@  struct dentry *qnx6_lookup(struct inode *dir, struct dentry *dentry,
 
 	ino = qnx6_find_entry(len, dir, name, &page);
 	if (ino) {
-		foundinode = qnx6_iget(dir->i_sb, ino);
+		foundinode = qnx6_iget(inode_sb(dir), ino);
 		qnx6_put_page(page);
 		if (IS_ERR(foundinode)) {
 			pr_debug("lookup->iget ->  error %ld\n",