public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Grzegorz Piotr Jaskiewicz <gj@pointblue.com.pl>
To: Andrew Morton <akpm@osdl.org>
Cc: kernel list <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/3] compilation fixes for gcc 4.0
Date: Wed, 22 Sep 2004 21:23:44 +0200	[thread overview]
Message-ID: <4151D140.9040600@pointblue.com.pl> (raw)

This one causes most doubts in me, as it is a function declared inside 
body of another function.

Is there really a need to have such mad code in reiser4 fs ??
This issue was raised already on reiser4 mailing list.
Here it's only for reviev and opinions, if no doubts, please apply.

Signed-off-by: Grzegorz Jaskiewicz <gj at pointblue.com.pl>

--- fs/reiser4/search.c    2004-09-22 20:38:04 +0200
+++ fs/reiser4/search.new.c        2004-09-22 20:37:26 +0200
@@ -1088,6 +1088,20 @@
 }
 #endif

+/* true if @key is left delimiting key of @node */
+static int key_is_ld(znode * node, const reiser4_key * key) {
+       int ld;
+
+        assert("nikita-1716", node != NULL);
+        assert("nikita-1758", key != NULL);
+
+        RLOCK_DK(znode_get_tree(node));
+        assert("nikita-1759", znode_contains_key(node, key));
+        ld = keyeq(znode_get_ld_key(node), key);
+        RUNLOCK_DK(znode_get_tree(node));
+        return ld;
+}
+
 /* Process one node during tree traversal.

    This is called by cbk_level_lookup(). */
@@ -1107,19 +1121,6 @@
        /* result */
        int result;

-       /* true if @key is left delimiting key of @node */
-       static int key_is_ld(znode * node, const reiser4_key * key) {
-               int ld;
-
-                assert("nikita-1716", node != NULL);
-                assert("nikita-1758", key != NULL);
-
-                RLOCK_DK(znode_get_tree(node));
-                assert("nikita-1759", znode_contains_key(node, key));
-                ld = keyeq(znode_get_ld_key(node), key);
-                RUNLOCK_DK(znode_get_tree(node));
-                return ld;
-       }
        assert("nikita-379", h != NULL);

        active = h->active_lh->node;


--
GJ

             reply	other threads:[~2004-09-22 19:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-09-22 19:23 Grzegorz Piotr Jaskiewicz [this message]
2004-09-23  2:07 ` [PATCH 3/3] compilation fixes for gcc 4.0 Grzegorz Piotr Jaskiewicz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4151D140.9040600@pointblue.com.pl \
    --to=gj@pointblue.com.pl \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox