From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755285Ab1AFXyi (ORCPT ); Thu, 6 Jan 2011 18:54:38 -0500 Received: from lon1-post-2.mail.demon.net ([195.173.77.149]:63196 "EHLO lon1-post-2.mail.demon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755257Ab1AFXyX (ORCPT ); Thu, 6 Jan 2011 18:54:23 -0500 Message-ID: <4D26562B.8000009@lougher.demon.co.uk> Date: Thu, 06 Jan 2011 23:54:19 +0000 From: Phillip Lougher User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Geert Uytterhoeven CC: Linux Kernel Development , linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 4/5] Squashfs: move squashfs_i() definition from squashfs.h References: <4D26364E.8030909@lougher.demon.co.uk> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Geert Uytterhoeven wrote: > On Thu, Jan 6, 2011 at 22:38, Phillip Lougher > 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? Not sure what you mean here, do you mean what is this file? If so then it is the inode_info definition file, as used in numerous file systems, ./fs/squashfs/squashfs_fs_i.h ./fs/jffs2/jffs2_fs_i.h ./fs/autofs4/autofs_i.h ./fs/udf/udf_i.h ./fs/fuse/fuse_i.h ./include/linux/ncp_fs_i.h ./include/linux/ext3_fs_i.h ./include/linux/nfs_fs_i.h ./include/linux/pipe_fs_i.h ./include/linux/coda_fs_i.h ./include/linux/reiserfs_fs_i.h ./include/linux/udf_fs_i.h ./drivers/staging/autofs/autofs_i.h ./drivers/staging/smbfs/smb_fs_i.h If you mean is this a typo for squashfs.h (as squashfs_i() is being moved out of squashfs.h)? ... Then no - the squashfs_i() definition relies on a struct defined in squashfs_fs_i.h, which means any file including squashfs.h needs to include squashfs_fs_i.h simply because of the squashfs_i() definition - which should have been in squashfs_fs_i.h. Phillip > >> Signed-off-by: Phillip Lougher >> --- >> 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@linux-m68k.org > > 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 >