From: Li Zefan <lizf@cn.fujitsu.com>
To: Chris Mason <chris.mason@oracle.com>
Cc: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Subject: [PATCH 07/16] Btrfs: remove remaining ref-cache code
Date: Thu, 14 Jul 2011 11:17:27 +0800 [thread overview]
Message-ID: <4E1E5FC7.1060402@cn.fujitsu.com> (raw)
In-Reply-To: <4E1E5F59.5030208@cn.fujitsu.com>
Since commit f2a97a9dbd86eb1ef956bdf20e05c507b32beb96
("btrfs: remove all unused functions"), there's no extern functions
at all in ref-cache.c, so just remove the remaining dead code.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
fs/btrfs/ref-cache.c | 68 --------------------------------------------------
fs/btrfs/ref-cache.h | 52 --------------------------------------
2 files changed, 0 insertions(+), 120 deletions(-)
delete mode 100644 fs/btrfs/ref-cache.c
delete mode 100644 fs/btrfs/ref-cache.h
diff --git a/fs/btrfs/ref-cache.c b/fs/btrfs/ref-cache.c
deleted file mode 100644
index 82d569c..0000000
--- a/fs/btrfs/ref-cache.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2008 Oracle. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License v2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- */
-
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/sort.h>
-#include "ctree.h"
-#include "ref-cache.h"
-#include "transaction.h"
-
-static struct rb_node *tree_insert(struct rb_root *root, u64 bytenr,
- struct rb_node *node)
-{
- struct rb_node **p = &root->rb_node;
- struct rb_node *parent = NULL;
- struct btrfs_leaf_ref *entry;
-
- while (*p) {
- parent = *p;
- entry = rb_entry(parent, struct btrfs_leaf_ref, rb_node);
-
- if (bytenr < entry->bytenr)
- p = &(*p)->rb_left;
- else if (bytenr > entry->bytenr)
- p = &(*p)->rb_right;
- else
- return parent;
- }
-
- entry = rb_entry(node, struct btrfs_leaf_ref, rb_node);
- rb_link_node(node, parent, p);
- rb_insert_color(node, root);
- return NULL;
-}
-
-static struct rb_node *tree_search(struct rb_root *root, u64 bytenr)
-{
- struct rb_node *n = root->rb_node;
- struct btrfs_leaf_ref *entry;
-
- while (n) {
- entry = rb_entry(n, struct btrfs_leaf_ref, rb_node);
- WARN_ON(!entry->in_tree);
-
- if (bytenr < entry->bytenr)
- n = n->rb_left;
- else if (bytenr > entry->bytenr)
- n = n->rb_right;
- else
- return n;
- }
- return NULL;
-}
diff --git a/fs/btrfs/ref-cache.h b/fs/btrfs/ref-cache.h
deleted file mode 100644
index 24f7001..0000000
--- a/fs/btrfs/ref-cache.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2008 Oracle. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License v2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- */
-#ifndef __REFCACHE__
-#define __REFCACHE__
-
-struct btrfs_extent_info {
- /* bytenr and num_bytes find the extent in the extent allocation tree */
- u64 bytenr;
- u64 num_bytes;
-
- /* objectid and offset find the back reference for the file */
- u64 objectid;
- u64 offset;
-};
-
-struct btrfs_leaf_ref {
- struct rb_node rb_node;
- struct btrfs_leaf_ref_tree *tree;
- int in_tree;
- atomic_t usage;
-
- u64 root_gen;
- u64 bytenr;
- u64 owner;
- u64 generation;
- int nritems;
-
- struct list_head list;
- struct btrfs_extent_info extents[];
-};
-
-static inline size_t btrfs_leaf_ref_size(int nr_extents)
-{
- return sizeof(struct btrfs_leaf_ref) +
- sizeof(struct btrfs_extent_info) * nr_extents;
-}
-#endif
--
1.7.3.1
next prev parent reply other threads:[~2011-07-14 3:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-14 3:15 [PATCH 00/16] Btrfs: fixes and cleanups for 3.1 Li Zefan
2011-07-14 3:16 ` [PATCH 01/16] Btrfs: copy string correctly in INO_LOOKUP ioctl Li Zefan
2011-07-14 3:16 ` [PATCH 02/16] Btrfs: fix space leak when skipping small extents during trimming Li Zefan
2011-07-14 3:16 ` [PATCH 03/16] Btrfs: fix space leak when trimming free extents Li Zefan
2011-07-14 3:16 ` [PATCH 04/16] Btrfs: check the nodatasum flag when writing compressed files Li Zefan
2011-07-14 3:17 ` [PATCH 05/16] Btrfs: use wait_event() Li Zefan
2011-07-14 3:17 ` [PATCH 06/16] Btrfs: remove a BUG_ON() in btrfs_commit_transaction() Li Zefan
2011-07-14 3:17 ` Li Zefan [this message]
2011-07-14 3:17 ` [PATCH 08/16] Btrfs: make acl functions really no-op if acl is not enabled Li Zefan
2011-07-14 3:17 ` [PATCH 09/16] Btrfs: remove redundant code for dir item lookup Li Zefan
2011-07-14 3:18 ` [PATCH 10/16] Btrfs: clean up search_extent_mapping() Li Zefan
2011-07-14 3:18 ` [PATCH 11/16] Btrfs: clean up code for extent_map lookup Li Zefan
2011-07-22 13:20 ` David Sterba
2011-07-14 3:18 ` [PATCH 12/16] Btrfs: clean up code for merging extent maps Li Zefan
2011-07-14 3:18 ` [PATCH 13/16] Btrfs: remove unused members from struct extent_state Li Zefan
2011-07-14 3:19 ` [PATCH 14/16] Btrfs: clean up for insert_state() Li Zefan
2011-07-14 3:19 ` [PATCH 15/16] Btrfs: clean up for wait_extent_bit() Li Zefan
2011-07-14 3:19 ` [PATCH 16/16] Btrfs: clean up for find_first_extent_bit() Li Zefan
2011-07-14 3:21 ` [PATCH 00/16] Btrfs: fixes and cleanups for 3.1 Li Zefan
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=4E1E5FC7.1060402@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=chris.mason@oracle.com \
--cc=linux-btrfs@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;
as well as URLs for NNTP newsgroup(s).