[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.

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index e0b457632f5563a0aba9ee9e041b8573c53f40f6..4fe8843c58997301d2a313fe1b15c1685a4f3d9d 100644 (file)
--- 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 dbb515c33e3793a158f3985aa63fa0cda81dd755..5d3eee75a9cb89989d486d9cb28eaba2aa6136be 100644 (file)
--- 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 07ce420bd14dc9c2be5754b020167b2ba21b851b..319d19aa63cfeee9f042945a87d77248ad904f0d 100644 (file)
--- 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;