diff options
author | Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> | 2006-12-08 05:36:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:40 -0500 |
commit | fec6d055da71fb02a76f9c2c12427fa79974018b (patch) | |
tree | d6fb2e5fea74ab83280389ef8a16564bf284ebc5 /fs/reiserfs/tail_conversion.c | |
parent | 0cc72dc7f050188d8d7344b1dd688cbc68d3cd30 (diff) |
[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>
Diffstat (limited to 'fs/reiserfs/tail_conversion.c')
-rw-r--r-- | fs/reiserfs/tail_conversion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c index 36f108fc1cf5..f8121a1147e8 100644 --- a/fs/reiserfs/tail_conversion.c +++ b/fs/reiserfs/tail_conversion.c | |||
@@ -15,7 +15,7 @@ | |||
15 | /* path points to first direct item of the file regarless of how many of | 15 | /* path points to first direct item of the file regarless of how many of |
16 | them are there */ | 16 | them are there */ |
17 | int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, | 17 | int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, |
18 | struct path *path, struct buffer_head *unbh, | 18 | struct treepath *path, struct buffer_head *unbh, |
19 | loff_t tail_offset) | 19 | loff_t tail_offset) |
20 | { | 20 | { |
21 | struct super_block *sb = inode->i_sb; | 21 | struct super_block *sb = inode->i_sb; |
@@ -171,7 +171,7 @@ void reiserfs_unmap_buffer(struct buffer_head *bh) | |||
171 | what we expect from it (number of cut bytes). But when tail remains | 171 | what we expect from it (number of cut bytes). But when tail remains |
172 | in the unformatted node, we set mode to SKIP_BALANCING and unlock | 172 | in the unformatted node, we set mode to SKIP_BALANCING and unlock |
173 | inode */ | 173 | inode */ |
174 | int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_inode, struct page *page, struct path *p_s_path, /* path to the indirect item. */ | 174 | int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_inode, struct page *page, struct treepath *p_s_path, /* path to the indirect item. */ |
175 | const struct cpu_key *p_s_item_key, /* Key to look for unformatted node pointer to be cut. */ | 175 | const struct cpu_key *p_s_item_key, /* Key to look for unformatted node pointer to be cut. */ |
176 | loff_t n_new_file_size, /* New file size. */ | 176 | loff_t n_new_file_size, /* New file size. */ |
177 | char *p_c_mode) | 177 | char *p_c_mode) |