Re: [PATCH 4/5] Squashfs: move squashfs_i() definition from squashfs.h

[Geert Uytterhoeven]

On Thu, Jan 6, 2011 at 22:38, Phillip Lougher
<phillip@xxxxxxxxxxxxxxxxxxx> wrote:
>
> Move squashfs_i() definition out of squashfs.h, this eliminates
> the need to #include squashfs_sb_i.h from numerous files.
                       ^^^^^^^^^^^^^^^
squashfs_fs_i.h?

> Signed-off-by: Phillip Lougher <phillip@xxxxxxxxxxxxxxxxxxx>
> ---
> Âfs/squashfs/block.c     |  Â1 -
> Âfs/squashfs/cache.c     |  Â1 -
> Âfs/squashfs/decompressor.c Â| Â Â1 -
> Âfs/squashfs/fragment.c   Â|  Â1 -
> Âfs/squashfs/id.c      Â|  Â1 -
> Âfs/squashfs/lzo_wrapper.c  |  Â1 -
> Âfs/squashfs/squashfs.h   Â|  Â5 -----
> Âfs/squashfs/squashfs_fs_i.h | Â Â6 ++++++
> Âfs/squashfs/xattr_id.c   Â|  Â1 -
> Âfs/squashfs/zlib_wrapper.c Â| Â Â1 -
> Â10 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c
> index 653c030..2fb2882 100644
> --- a/fs/squashfs/block.c
> +++ b/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/fs/squashfs/cache.c b/fs/squashfs/cache.c
> index 57314be..26b15ae 100644
> --- a/fs/squashfs/cache.c
> +++ b/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/fs/squashfs/decompressor.c b/fs/squashfs/decompressor.c
> index 24af9ce..d83e184 100644
> --- a/fs/squashfs/decompressor.c
> +++ b/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/fs/squashfs/fragment.c b/fs/squashfs/fragment.c
> index 7c90bbd..7eef571 100644
> --- a/fs/squashfs/fragment.c
> +++ b/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/fs/squashfs/id.c b/fs/squashfs/id.c
> index b7f64bc..d8f3245 100644
> --- a/fs/squashfs/id.c
> +++ b/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/fs/squashfs/lzo_wrapper.c b/fs/squashfs/lzo_wrapper.c
> index 5d87789..7da759e 100644
> --- a/fs/squashfs/lzo_wrapper.c
> +++ b/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/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
> index 5d45569..18f187f 100644
> --- a/fs/squashfs/squashfs.h
> +++ b/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/fs/squashfs/squashfs_fs_i.h b/fs/squashfs/squashfs_fs_i.h
> index d3e3a37..359baef 100644
> --- a/fs/squashfs/squashfs_fs_i.h
> +++ b/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/fs/squashfs/xattr_id.c b/fs/squashfs/xattr_id.c
> index d33be5d..05385db 100644
> --- a/fs/squashfs/xattr_id.c
> +++ b/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/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c
> index ab5801f..818a5e0 100644
> --- a/fs/squashfs/zlib_wrapper.c
> +++ b/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"

Gr{oetje,eeting}s,

            Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
             Â Â -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/