Skip to content

Commit

Permalink
Squashfs: move squashfs_i() definition from squashfs.h
Browse files Browse the repository at this point in the history 
Move squashfs_i() definition out of squashfs.h, this eliminates
the need to #include squashfs_fs_i.h from numerous files.

Signed-off-by: Phillip Lougher <[email protected]>
  • Loading branch information
Phillip Lougher committed Jan 13, 2011
1 parent 6197fd8 commit 8fcd972
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 13 deletions.
1 change: 0 additions & 1 deletion fs/squashfs/block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "squashfs.h"
#include "decompressor.h"

Expand Down
1 change: 0 additions & 1 deletion fs/squashfs/cache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@

#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "squashfs.h"

/*
Expand Down
1 change: 0 additions & 1 deletion fs/squashfs/decompressor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "decompressor.h"
#include "squashfs.h"

Expand Down
1 change: 0 additions & 1 deletion fs/squashfs/fragment.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "squashfs.h"

/*
Expand Down
1 change: 0 additions & 1 deletion fs/squashfs/id.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "squashfs.h"

/*
Expand Down
1 change: 0 additions & 1 deletion fs/squashfs/lzo_wrapper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "squashfs.h"
#include "decompressor.h"

Expand Down
5 changes: 0 additions & 5 deletions fs/squashfs/squashfs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 6 additions & 0 deletions fs/squashfs/squashfs_fs_i.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion fs/squashfs/xattr_id.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "squashfs.h"
#include "xattr.h"

Expand Down
1 change: 0 additions & 1 deletion fs/squashfs/zlib_wrapper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "squashfs.h"
#include "decompressor.h"

Expand Down

0 comments on commit 8fcd972

Please sign in to comment.