aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/namei.c
diff options
context:
space:
mode:
authorJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>2006-12-08 05:36:32 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:40 -0500
commitfec6d055da71fb02a76f9c2c12427fa79974018b (patch)
treed6fb2e5fea74ab83280389ef8a16564bf284ebc5 /fs/reiserfs/namei.c
parent0cc72dc7f050188d8d7344b1dd688cbc68d3cd30 (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/namei.c')
-rw-r--r--fs/reiserfs/namei.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index abde1edc2235..23f5cd5bbf56 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -54,7 +54,7 @@ static int bin_search_in_dir_item(struct reiserfs_dir_entry *de, loff_t off)
54 54
55// comment? maybe something like set de to point to what the path points to? 55// comment? maybe something like set de to point to what the path points to?
56static inline void set_de_item_location(struct reiserfs_dir_entry *de, 56static inline void set_de_item_location(struct reiserfs_dir_entry *de,
57 struct path *path) 57 struct treepath *path)
58{ 58{
59 de->de_bh = get_last_bh(path); 59 de->de_bh = get_last_bh(path);
60 de->de_ih = get_ih(path); 60 de->de_ih = get_ih(path);
@@ -113,7 +113,7 @@ entry position in the item
113 113
114/* The function is NOT SCHEDULE-SAFE! */ 114/* The function is NOT SCHEDULE-SAFE! */
115int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, 115int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
116 struct path *path, struct reiserfs_dir_entry *de) 116 struct treepath *path, struct reiserfs_dir_entry *de)
117{ 117{
118 int retval; 118 int retval;
119 119
@@ -282,7 +282,7 @@ static int linear_search_in_dir_item(struct cpu_key *key,
282// may return NAME_FOUND, NAME_FOUND_INVISIBLE, NAME_NOT_FOUND 282// may return NAME_FOUND, NAME_FOUND_INVISIBLE, NAME_NOT_FOUND
283// FIXME: should add something like IOERROR 283// FIXME: should add something like IOERROR
284static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen, 284static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen,
285 struct path *path_to_entry, 285 struct treepath *path_to_entry,
286 struct reiserfs_dir_entry *de) 286 struct reiserfs_dir_entry *de)
287{ 287{
288 struct cpu_key key_to_search; 288 struct cpu_key key_to_search;