diff options
author | Jeff Mahoney <jeffm@suse.com> | 2013-08-26 11:19:12 -0400 |
---|---|---|
committer | Jeff Mahoney <jeffm@suse.com> | 2013-08-26 19:00:03 -0400 |
commit | a1623ca6b3e7173cb8b359ac1908f63a9cf091a9 (patch) | |
tree | 2d0592c574432ea0ba390e67cb0d5d939475cf0c | |
parent | b94873771b387c26fd0baa51bbc83cf31f3c00bf (diff) | |
download | reiserfsprogs-a1623ca6b3e7173cb8b359ac1908f63a9cf091a9.tar.gz |
reiserfscore: rename usearch_by_position to reiserfs_search_by_position
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
-rw-r--r-- | fsck/ufile.c | 8 | ||||
-rw-r--r-- | include/reiserfs_lib.h | 4 | ||||
-rw-r--r-- | reiserfscore/reiserfslib.c | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/fsck/ufile.c b/fsck/ufile.c index 6765b84..68add8a 100644 --- a/fsck/ufile.c +++ b/fsck/ufile.c @@ -219,7 +219,7 @@ int are_file_items_correct(struct item_head *sd_ih, void *sd, __u64 * size, path.path_length = ILLEGAL_PATH_ELEMENT_OFFSET; do { - retval = usearch_by_position(fs, key, key_version, &path); + retval = reiserfs_search_by_position(fs, key, key_version, &path); if (retval == POSITION_FOUND && path.pos_in_item != 0) die("are_file_items_correct: All bytes we look for must be first items byte (position 0)."); @@ -800,7 +800,7 @@ static void direct2indirect2(unsigned long unfm, struct reiserfs_path *path) // key.k_offset -= copied; ni = cpu_to_le32(unbh->b_blocknr); - if (usearch_by_position(fs, &key, file_format, path) == FILE_NOT_FOUND) { + if (reiserfs_search_by_position(fs, &key, file_format, path) == FILE_NOT_FOUND) { struct item_head insih; copy_key(&(insih.ih_key), &key); @@ -836,7 +836,7 @@ static void direct2indirect2(unsigned long unfm, struct reiserfs_path *path) mark_buffer_uptodate(unbh, 1); brelse(unbh); - if (usearch_by_position(fs, &key, file_format, path) != POSITION_FOUND + if (reiserfs_search_by_position(fs, &key, file_format, path) != POSITION_FOUND || !is_indirect_ih(tp_item_head(path))) reiserfs_panic ("direct2indirect: The data %k, which are supposed to be converted, are not found", @@ -1326,7 +1326,7 @@ check_again: while (count) { - retval = usearch_by_position(fs, &key, key_format(&key), &path); + retval = reiserfs_search_by_position(fs, &key, key_format(&key), &path); /* if there are items of bigger offset than we are looking for and there is no item between wamted offset and SD, insert first item */ diff --git a/include/reiserfs_lib.h b/include/reiserfs_lib.h index 571b07d..606d076 100644 --- a/include/reiserfs_lib.h +++ b/include/reiserfs_lib.h @@ -129,8 +129,8 @@ int reiserfs_search_by_key_4(reiserfs_filsys_t *, struct reiserfs_key *key, struct reiserfs_path *path); int reiserfs_search_by_entry_key(reiserfs_filsys_t *, struct reiserfs_key *key, struct reiserfs_path *path); -int usearch_by_position(reiserfs_filsys_t *, struct reiserfs_key *key, - int version, struct reiserfs_path *path); +int reiserfs_search_by_position(reiserfs_filsys_t *, struct reiserfs_key *key, + int version, struct reiserfs_path *path); struct reiserfs_key *reiserfs_next_key(struct reiserfs_path *path); void copy_key(void *to, const void *from); void copy_short_key(void *to, const void *from); diff --git a/reiserfscore/reiserfslib.c b/reiserfscore/reiserfslib.c index f5b49f5..cba2b0f 100644 --- a/reiserfscore/reiserfslib.c +++ b/reiserfscore/reiserfslib.c @@ -509,8 +509,8 @@ int reiserfs_search_by_key_4(reiserfs_filsys_t *fs, struct reiserfs_key *key, /* key is key of byte in the regular file. This searches in tree through items and in the found item as well */ -int usearch_by_position(reiserfs_filsys_t *s, struct reiserfs_key *key, - int version, struct reiserfs_path *path) +int reiserfs_search_by_position(reiserfs_filsys_t *s, struct reiserfs_key *key, + int version, struct reiserfs_path *path) { struct buffer_head *bh; struct item_head *ih; @@ -561,8 +561,8 @@ int usearch_by_position(reiserfs_filsys_t *s, struct reiserfs_key *key, if (is_direntry_key(next_key)) { reiserfs_warning(stderr, - "usearch_by_position: looking for %k found a directory with the same key\n", - next_key); + "%s: looking for %k found a directory with the same key\n", + __func__, next_key); return DIRECTORY_FOUND; } @@ -1468,9 +1468,9 @@ void add_badblock_list(reiserfs_filsys_t *fs, int replace) set_offset(KEY_FORMAT_2, &badblock_ih.ih_key, offset); ni = cpu_to_le32(i); - retval = usearch_by_position(fs, &badblock_ih.ih_key, - key_format(&badblock_ih.ih_key), - &badblock_path); + retval = reiserfs_search_by_position(fs, &badblock_ih.ih_key, + key_format(&badblock_ih.ih_key), + &badblock_path); switch (retval) { case (FILE_NOT_FOUND): |