From a921332a8a6ef0785dee725eb7717ee89dbd607f Mon Sep 17 00:00:00 2001 From: Hans Reiser Date: Tue, 5 Feb 2002 01:11:00 -0800 Subject: [PATCH] [PATCH] reiserfs patchset, patch 7 of 9 07-remove_nospace_warnings.diff 07-remove_nospace_warnings.diff Do not print scary warnings in out of free space situations. --- fs/reiserfs/inode.c | 3 ++- fs/reiserfs/stree.c | 6 ++++-- fs/reiserfs/super.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index e0b457632f55..4fe8843c5899 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -743,7 +743,8 @@ int reiserfs_get_block (struct inode * inode, sector_t block, retval = convert_tail_for_hole(inode, bh_result, tail_offset) ; if (retval) { - printk("clm-6004: convert tail failed inode %lu, error %d\n", inode->i_ino, retval) ; + if ( retval != -ENOSPC ) + printk("clm-6004: convert tail failed inode %lu, error %d\n", inode->i_ino, retval) ; if (allocated_block_nr) reiserfs_free_block (&th, allocated_block_nr); goto failure ; diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index dbb515c33e37..5d3eee75a9cb 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c @@ -1338,8 +1338,10 @@ void reiserfs_delete_solid_item (struct reiserfs_transaction_handle *th, } if (retval != ITEM_FOUND) { pathrelse (&path); - reiserfs_warning ("vs-5355: reiserfs_delete_solid_item: %k not found", - key); + // No need for a warning, if there is just no free space to insert '..' item into the newly-created subdir + if ( !( (unsigned long long) GET_HASH_VALUE (le_key_k_offset (le_key_version (key), key)) == 0 && \ + (unsigned long long) GET_GENERATION_NUMBER (le_key_k_offset (le_key_version (key), key)) == 1 ) ) + reiserfs_warning ("vs-5355: reiserfs_delete_solid_item: %k not found", key); break; } if (!tb_init) { diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 07ce420bd14d..319d19aa63cf 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -284,7 +284,8 @@ void add_save_link (struct reiserfs_transaction_handle * th, /* look for its place in the tree */ retval = search_item (inode->i_sb, &key, &path); if (retval != ITEM_NOT_FOUND) { - reiserfs_warning ("vs-2100: add_save_link:" + if ( retval != -ENOSPC ) + reiserfs_warning ("vs-2100: add_save_link:" "search_by_key (%K) returned %d\n", &key, retval); pathrelse (&path); return; -- 2.39.5