aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/namei.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2009-03-30 14:02:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 15:16:37 -0400
commit0030b64570c862f04c1550ba4a0bf7a9c128162a (patch)
tree811b8eec4a417983ad1e5b51f44194f9cc98496d /fs/reiserfs/namei.c
parent1e5e59d431038c53954fe8f0b38bee0f0ad30349 (diff)
reiserfs: use reiserfs_error()
This patch makes many paths that are currently using warnings to handle the error. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/namei.c')
-rw-r--r--fs/reiserfs/namei.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index ef41cc882bd9..3ce3f8b1690d 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -120,8 +120,8 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
120 switch (retval) { 120 switch (retval) {
121 case ITEM_NOT_FOUND: 121 case ITEM_NOT_FOUND:
122 if (!PATH_LAST_POSITION(path)) { 122 if (!PATH_LAST_POSITION(path)) {
123 reiserfs_warning(sb, "vs-7000", "search_by_key " 123 reiserfs_error(sb, "vs-7000", "search_by_key "
124 "returned item position == 0"); 124 "returned item position == 0");
125 pathrelse(path); 125 pathrelse(path);
126 return IO_ERROR; 126 return IO_ERROR;
127 } 127 }
@@ -135,7 +135,7 @@ int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
135 135
136 default: 136 default:
137 pathrelse(path); 137 pathrelse(path);
138 reiserfs_warning(sb, "vs-7002", "no path to here"); 138 reiserfs_error(sb, "vs-7002", "no path to here");
139 return IO_ERROR; 139 return IO_ERROR;
140 } 140 }
141 141
@@ -298,7 +298,7 @@ static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen,
298 search_by_entry_key(dir->i_sb, &key_to_search, 298 search_by_entry_key(dir->i_sb, &key_to_search,
299 path_to_entry, de); 299 path_to_entry, de);
300 if (retval == IO_ERROR) { 300 if (retval == IO_ERROR) {
301 reiserfs_warning(dir->i_sb, "zam-7001", "io error"); 301 reiserfs_error(dir->i_sb, "zam-7001", "io error");
302 return IO_ERROR; 302 return IO_ERROR;
303 } 303 }
304 304
@@ -481,9 +481,9 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
481 } 481 }
482 482
483 if (retval != NAME_FOUND) { 483 if (retval != NAME_FOUND) {
484 reiserfs_warning(dir->i_sb, "zam-7002", 484 reiserfs_error(dir->i_sb, "zam-7002",
485 "reiserfs_find_entry() returned " 485 "reiserfs_find_entry() returned "
486 "unexpected value (%d)", retval); 486 "unexpected value (%d)", retval);
487 } 487 }
488 488
489 return -EEXIST; 489 return -EEXIST;
@@ -899,9 +899,9 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
899 goto end_rmdir; 899 goto end_rmdir;
900 900
901 if (inode->i_nlink != 2 && inode->i_nlink != 1) 901 if (inode->i_nlink != 2 && inode->i_nlink != 1)
902 reiserfs_warning(inode->i_sb, "reiserfs-7040", 902 reiserfs_error(inode->i_sb, "reiserfs-7040",
903 "empty directory has nlink != 2 (%d)", 903 "empty directory has nlink != 2 (%d)",
904 inode->i_nlink); 904 inode->i_nlink);
905 905
906 clear_nlink(inode); 906 clear_nlink(inode);
907 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; 907 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
@@ -1494,8 +1494,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1494 if (reiserfs_cut_from_item 1494 if (reiserfs_cut_from_item
1495 (&th, &old_entry_path, &(old_de.de_entry_key), old_dir, NULL, 1495 (&th, &old_entry_path, &(old_de.de_entry_key), old_dir, NULL,
1496 0) < 0) 1496 0) < 0)
1497 reiserfs_warning(old_dir->i_sb, "vs-7060", 1497 reiserfs_error(old_dir->i_sb, "vs-7060",
1498 "couldn't not cut old name. Fsck later?"); 1498 "couldn't not cut old name. Fsck later?");
1499 1499
1500 old_dir->i_size -= DEH_SIZE + old_de.de_entrylen; 1500 old_dir->i_size -= DEH_SIZE + old_de.de_entrylen;
1501 1501