[PATCH 1/3] PMFS: Rename pmfs_inode_vfs to pmfs_inode_info

[Matthew Wilcox]

Matches other filesystems, particularly extN

Signed-off-by: Matthew Wilcox <matthew.r.wilcox at intel.com>
---
 fs/pmfs/inode.c | 4 ++--
 fs/pmfs/namei.c | 2 +-
 fs/pmfs/pmfs.h  | 6 +++---
 fs/pmfs/super.c | 9 +++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/fs/pmfs/inode.c b/fs/pmfs/inode.c
index 0649f98..50d92bf 100644
--- a/fs/pmfs/inode.c
+++ b/fs/pmfs/inode.c
@@ -1308,7 +1308,7 @@ static void pmfs_block_truncate_page(struct inode *inode, loff_t newsize)
 void pmfs_truncate_del(struct inode *inode)
 {
 	struct list_head *prev;
-	struct pmfs_inode_vfs *si = PMFS_I(inode);
+	struct pmfs_inode_info *si = PMFS_I(inode);
 	struct super_block *sb = inode->i_sb;
 	struct pmfs_sb_info *sbi = PMFS_SB(sb);
 	struct pmfs_inode_truncate_item *head = pmfs_get_truncate_list_head(sb);
@@ -1339,7 +1339,7 @@ void pmfs_truncate_del(struct inode *inode)
 			sizeof(head->i_next_truncate), false);
 	} else {
 		struct inode *i_prv = &list_entry(prev,
-			struct pmfs_inode_vfs, i_truncated)->vfs_inode;
+			struct pmfs_inode_info, i_truncated)->vfs_inode;
 		struct pmfs_inode_truncate_item *li_prv = 
 				pmfs_get_truncate_item(sb, i_prv->i_ino);
 		pmfs_memunlock_range(sb, li_prv, sizeof(*li_prv));
diff --git a/fs/pmfs/namei.c b/fs/pmfs/namei.c
index 4e32120..0cc5ea3 100644
--- a/fs/pmfs/namei.c
+++ b/fs/pmfs/namei.c
@@ -140,7 +140,7 @@ static ino_t pmfs_inode_by_name(struct inode *dir, struct qstr *entry,
 	const u8 *name = entry->name;
 	struct super_block *sb = dir->i_sb;
 	unsigned long block, start;
-	struct pmfs_inode_vfs *si = PMFS_I(dir);
+	struct pmfs_inode_info *si = PMFS_I(dir);
 
 	pi = pmfs_get_inode(sb, dir->i_ino);
 
diff --git a/fs/pmfs/pmfs.h b/fs/pmfs/pmfs.h
index b4bcd9c..2285412 100644
--- a/fs/pmfs/pmfs.h
+++ b/fs/pmfs/pmfs.h
@@ -249,7 +249,7 @@ struct pmfs_blocknode {
 	unsigned long block_high;
 };
 
-struct pmfs_inode_vfs {
+struct pmfs_inode_info {
 	__u32   i_dir_start_lookup;
 	struct list_head i_truncated;
 	struct inode	vfs_inode;
@@ -316,9 +316,9 @@ static inline struct pmfs_sb_info *PMFS_SB(struct super_block *sb)
 	return sb->s_fs_info;
 }
 
-static inline struct pmfs_inode_vfs *PMFS_I(struct inode *inode)
+static inline struct pmfs_inode_info *PMFS_I(struct inode *inode)
 {
-	return container_of(inode, struct pmfs_inode_vfs, vfs_inode);
+	return container_of(inode, struct pmfs_inode_info, vfs_inode);
 }
 
 /* If this is part of a read-modify-write of the super block,
diff --git a/fs/pmfs/super.c b/fs/pmfs/super.c
index f54a916..4bf6874 100644
--- a/fs/pmfs/super.c
+++ b/fs/pmfs/super.c
@@ -982,11 +982,12 @@ struct pmfs_blocknode *pmfs_alloc_blocknode(struct super_block *sb)
 
 static struct inode *pmfs_alloc_inode(struct super_block *sb)
 {
-	struct pmfs_inode_vfs *vi = (struct pmfs_inode_vfs *)
-				     kmem_cache_alloc(pmfs_inode_cachep, GFP_NOFS);
+	struct pmfs_inode_info *vi;
 
+	vi = kmem_cache_alloc(pmfs_inode_cachep, GFP_NOFS);
 	if (!vi)
 		return NULL;
+
 	vi->vfs_inode.i_version = 1;
 	return &vi->vfs_inode;
 }
@@ -1005,7 +1006,7 @@ static void pmfs_destroy_inode(struct inode *inode)
 
 static void init_once(void *foo)
 {
-	struct pmfs_inode_vfs *vi = (struct pmfs_inode_vfs *)foo;
+	struct pmfs_inode_info *vi = foo;
 
 	vi->i_dir_start_lookup = 0;
 	INIT_LIST_HEAD(&vi->i_truncated);
@@ -1028,7 +1029,7 @@ static int __init init_blocknode_cache(void)
 static int __init init_inodecache(void)
 {
 	pmfs_inode_cachep = kmem_cache_create("pmfs_inode_cache",
-					       sizeof(struct pmfs_inode_vfs),
+					       sizeof(struct pmfs_inode_info),
 					       0, (SLAB_RECLAIM_ACCOUNT |
 						   SLAB_MEM_SPREAD), init_once);
 	if (pmfs_inode_cachep == NULL)
-- 
1.8.4.rc3