From 4308218320cd6518fc89d7b378fa70f2bff8456f Mon Sep 17 00:00:00 2001
From: Phillip Lougher <phillip@lougher.demon.co.uk>
Date: Thu, 6 Jan 2011 06:08:50 +0000
Subject: [PATCH] --- yaml --- r: 231537 b: refs/heads/master c:
 8fcd97216f45b1691f8f91f35cc108d06e0bfca8 h: refs/heads/master i:   231535:
 91e86347fe4361705bb13a616e1c7b2b62f6cc6a v: v3

---
 [refs]                            | 2 +-
 trunk/fs/squashfs/block.c         | 1 -
 trunk/fs/squashfs/cache.c         | 1 -
 trunk/fs/squashfs/decompressor.c  | 1 -
 trunk/fs/squashfs/fragment.c      | 1 -
 trunk/fs/squashfs/id.c            | 1 -
 trunk/fs/squashfs/lzo_wrapper.c   | 1 -
 trunk/fs/squashfs/squashfs.h      | 5 -----
 trunk/fs/squashfs/squashfs_fs_i.h | 6 ++++++
 trunk/fs/squashfs/xattr_id.c      | 1 -
 trunk/fs/squashfs/zlib_wrapper.c  | 1 -
 11 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index c9bd85b98032..18b0e5bbc7a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6197fd86789a28760f8375b5ae8885cd7258042f
+refs/heads/master: 8fcd97216f45b1691f8f91f35cc108d06e0bfca8
diff --git a/trunk/fs/squashfs/block.c b/trunk/fs/squashfs/block.c
index 653c030eb840..2fb2882f0fa7 100644
--- a/trunk/fs/squashfs/block.c
+++ b/trunk/fs/squashfs/block.c
@@ -34,7 +34,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "squashfs.h"
 #include "decompressor.h"
 
diff --git a/trunk/fs/squashfs/cache.c b/trunk/fs/squashfs/cache.c
index 57314bee9059..26b15ae34d6f 100644
--- a/trunk/fs/squashfs/cache.c
+++ b/trunk/fs/squashfs/cache.c
@@ -55,7 +55,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "squashfs.h"
 
 /*
diff --git a/trunk/fs/squashfs/decompressor.c b/trunk/fs/squashfs/decompressor.c
index 482d78197811..50b22d330cec 100644
--- a/trunk/fs/squashfs/decompressor.c
+++ b/trunk/fs/squashfs/decompressor.c
@@ -27,7 +27,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "decompressor.h"
 #include "squashfs.h"
 
diff --git a/trunk/fs/squashfs/fragment.c b/trunk/fs/squashfs/fragment.c
index 7c90bbd6879d..7eef571443c6 100644
--- a/trunk/fs/squashfs/fragment.c
+++ b/trunk/fs/squashfs/fragment.c
@@ -39,7 +39,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "squashfs.h"
 
 /*
diff --git a/trunk/fs/squashfs/id.c b/trunk/fs/squashfs/id.c
index b7f64bcd2b70..d8f32452638e 100644
--- a/trunk/fs/squashfs/id.c
+++ b/trunk/fs/squashfs/id.c
@@ -37,7 +37,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "squashfs.h"
 
 /*
diff --git a/trunk/fs/squashfs/lzo_wrapper.c b/trunk/fs/squashfs/lzo_wrapper.c
index 5d87789bf1c1..7da759e34c52 100644
--- a/trunk/fs/squashfs/lzo_wrapper.c
+++ b/trunk/fs/squashfs/lzo_wrapper.c
@@ -29,7 +29,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "squashfs.h"
 #include "decompressor.h"
 
diff --git a/trunk/fs/squashfs/squashfs.h b/trunk/fs/squashfs/squashfs.h
index 5d45569d5f72..18f187fb486b 100644
--- a/trunk/fs/squashfs/squashfs.h
+++ b/trunk/fs/squashfs/squashfs.h
@@ -27,11 +27,6 @@
 
 #define WARNING(s, args...)	pr_warning("SQUASHFS: "s, ## args)
 
-static inline struct squashfs_inode_info *squashfs_i(struct inode *inode)
-{
-	return list_entry(inode, struct squashfs_inode_info, vfs_inode);
-}
-
 /* block.c */
 extern int squashfs_read_data(struct super_block *, void **, u64, int, u64 *,
 				int, int);
diff --git a/trunk/fs/squashfs/squashfs_fs_i.h b/trunk/fs/squashfs/squashfs_fs_i.h
index d3e3a37f28a1..359baefc01fc 100644
--- a/trunk/fs/squashfs/squashfs_fs_i.h
+++ b/trunk/fs/squashfs/squashfs_fs_i.h
@@ -45,4 +45,10 @@ struct squashfs_inode_info {
 	};
 	struct inode	vfs_inode;
 };
+
+
+static inline struct squashfs_inode_info *squashfs_i(struct inode *inode)
+{
+	return list_entry(inode, struct squashfs_inode_info, vfs_inode);
+}
 #endif
diff --git a/trunk/fs/squashfs/xattr_id.c b/trunk/fs/squashfs/xattr_id.c
index d33be5dd6c32..05385dbe1465 100644
--- a/trunk/fs/squashfs/xattr_id.c
+++ b/trunk/fs/squashfs/xattr_id.c
@@ -32,7 +32,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "squashfs.h"
 #include "xattr.h"
 
diff --git a/trunk/fs/squashfs/zlib_wrapper.c b/trunk/fs/squashfs/zlib_wrapper.c
index ab5801f66e26..818a5e063faf 100644
--- a/trunk/fs/squashfs/zlib_wrapper.c
+++ b/trunk/fs/squashfs/zlib_wrapper.c
@@ -29,7 +29,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "squashfs.h"
 #include "decompressor.h"