[PATCH] struct path: rename Reiserfs's struct path
Rename Reiserfs's struct path to struct treepath to prevent name collision between it and struct path from fs/namei.c. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Cc: <reiserfs-dev@namesys.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
0cc72dc7f0
commit
fec6d055da
@@ -207,7 +207,7 @@ static int file_capable(struct inode *inode, long block)
|
||||
}
|
||||
|
||||
/*static*/ int restart_transaction(struct reiserfs_transaction_handle *th,
|
||||
struct inode *inode, struct path *path)
|
||||
struct inode *inode, struct treepath *path)
|
||||
{
|
||||
struct super_block *s = th->t_super;
|
||||
int len = th->t_blocks_allocated;
|
||||
@@ -570,7 +570,7 @@ static inline int _allocate_block(struct reiserfs_transaction_handle *th,
|
||||
long block,
|
||||
struct inode *inode,
|
||||
b_blocknr_t * allocated_block_nr,
|
||||
struct path *path, int flags)
|
||||
struct treepath *path, int flags)
|
||||
{
|
||||
BUG_ON(!th->t_trans_id);
|
||||
|
||||
@@ -1107,7 +1107,7 @@ static inline ulong to_fake_used_blocks(struct inode *inode, int sd_size)
|
||||
//
|
||||
|
||||
// called by read_locked_inode
|
||||
static void init_inode(struct inode *inode, struct path *path)
|
||||
static void init_inode(struct inode *inode, struct treepath *path)
|
||||
{
|
||||
struct buffer_head *bh;
|
||||
struct item_head *ih;
|
||||
@@ -1284,7 +1284,7 @@ static void inode2sd_v1(void *sd, struct inode *inode, loff_t size)
|
||||
/* NOTE, you must prepare the buffer head before sending it here,
|
||||
** and then log it after the call
|
||||
*/
|
||||
static void update_stat_data(struct path *path, struct inode *inode,
|
||||
static void update_stat_data(struct treepath *path, struct inode *inode,
|
||||
loff_t size)
|
||||
{
|
||||
struct buffer_head *bh;
|
||||
@@ -1653,7 +1653,7 @@ int reiserfs_write_inode(struct inode *inode, int do_sync)
|
||||
containing "." and ".." entries */
|
||||
static int reiserfs_new_directory(struct reiserfs_transaction_handle *th,
|
||||
struct inode *inode,
|
||||
struct item_head *ih, struct path *path,
|
||||
struct item_head *ih, struct treepath *path,
|
||||
struct inode *dir)
|
||||
{
|
||||
struct super_block *sb = th->t_super;
|
||||
@@ -1712,7 +1712,7 @@ static int reiserfs_new_directory(struct reiserfs_transaction_handle *th,
|
||||
containing the body of symlink */
|
||||
static int reiserfs_new_symlink(struct reiserfs_transaction_handle *th, struct inode *inode, /* Inode of symlink */
|
||||
struct item_head *ih,
|
||||
struct path *path, const char *symname,
|
||||
struct treepath *path, const char *symname,
|
||||
int item_len)
|
||||
{
|
||||
struct super_block *sb = th->t_super;
|
||||
|
Reference in New Issue
Block a user