EXT3 Users Mailing List

Akinobu Mita | 9 Sep 2005 10:42

[PATCH 0/6] jbd cleanup

The following 6 patches cleanup the jbd code and kill about 200 lines. 
First of 4 patches can apply to 2.6.13-git8 and 2.6.13-mm2.
The rest of them can apply to 2.6.13-mm2.

 fs/jbd/checkpoint.c          |  179 +++++++++++--------------------------------
 fs/jbd/commit.c              |  101 ++++++++++--------------
 fs/jbd/journal.c             |   11 +-
 fs/jbd/revoke.c              |  158 ++++++++++++++-----------------------
 fs/jbd/transaction.c         |  113 +++++----------------------
 include/linux/jbd.h          |   28 +++---
 include/linux/journal-head.h |    4 
 7 files changed, 201 insertions(+), 393 deletions(-)

Akinobu Mita | 9 Sep 2005 10:43

[PATCH 1/6] jbd: remove duplicated debug print

remove duplicated debug print

Signed-off-by: Akinobu Mita <mita <at> miraclelinux.com>

---

 commit.c |    2 --
 1 files changed, 2 deletions(-)

--- 2.6-mm/fs/jbd/commit.c.orig	2005-09-02 00:53:49.000000000 +0900
+++ 2.6-mm/fs/jbd/commit.c	2005-09-02 00:54:11.000000000 +0900
 <at>  <at>  -425,8 +425,6  <at>  <at>  write_out_data:

 	journal_write_revoke_records(journal, commit_transaction);

-	jbd_debug(3, "JBD: commit phase 2\n");
-
 	/*
 	 * If we found any dirty or locked buffers, then we should have
 	 * looped back up to the write_out_data label.  If there weren't

Akinobu Mita | 9 Sep 2005 10:44

[PATCH 2/6] jbd: use hlist for the revoke tables

use struct hlist_head and hlist_node for the revoke tables.

Signed-off-by: Akinobu Mita <mita <at> miraclelinux.com>

---

 revoke.c |   56 ++++++++++++++++++++++++++------------------------------
 1 files changed, 26 insertions(+), 30 deletions(-)

diff -Nurp 2.6.13-mm1.old/fs/jbd/revoke.c 2.6.13-mm1/fs/jbd/revoke.c
--- 2.6.13-mm1.old/fs/jbd/revoke.c	2005-09-04 21:46:35.000000000 +0900
+++ 2.6.13-mm1/fs/jbd/revoke.c	2005-09-04 21:50:25.000000000 +0900
 <at>  <at>  -79,7 +79,7  <at>  <at>  static kmem_cache_t *revoke_table_cache;

 struct jbd_revoke_record_s 
 {
-	struct list_head  hash;
+	struct hlist_node hash;
 	tid_t		  sequence;	/* Used for recovery only */
 	unsigned long	  blocknr;
 };
 <at>  <at>  -92,7 +92,7  <at>  <at>  struct jbd_revoke_table_s
 	 * for recovery.  Must be a power of two. */
 	int		  hash_size; 
 	int		  hash_shift; 
-	struct list_head *hash_table;
+	struct hlist_head *hash_table;
 };

(Continue reading)

Akinobu Mita | 9 Sep 2005 10:46

[PATCH 3/6] jbd: cleanup for initializing/destroying the revoke tables

use loop counter for initializing/destroying a pair of the revoke tables.

Signed-off-by: Akinobu Mita <mita <at> miraclelinux.com>

---

 revoke.c |  116 ++++++++++++++++++++++-----------------------------------------
 1 files changed, 42 insertions(+), 74 deletions(-)

diff -X 2.6.13-mm1/Documentation/dontdiff -Nurp 2.6.13-mm1.old/fs/jbd/revoke.c 2.6.13-mm1/fs/jbd/revoke.c
--- 2.6.13-mm1.old/fs/jbd/revoke.c	2005-09-05 03:21:00.000000000 +0900
+++ 2.6.13-mm1/fs/jbd/revoke.c	2005-09-05 11:16:04.000000000 +0900
 <at>  <at>  -193,108 +193,76  <at>  <at>  void journal_destroy_revoke_caches(void)

 int journal_init_revoke(journal_t *journal, int hash_size)
 {
-	int shift, tmp;
+	int shift = 0;
+	int tmp = hash_size;
+	int i;

+	/* Check that the hash_size is a power of two */
+	J_ASSERT ((hash_size & (hash_size-1)) == 0);
 	J_ASSERT (journal->j_revoke_table[0] == NULL);

-	shift = 0;
-	tmp = hash_size;
-	while((tmp >>= 1UL) != 0UL)
+	while ((tmp >>= 1UL) != 0UL)
 		shift++;

(Continue reading)

Akinobu Mita | 9 Sep 2005 10:47

[PATCH 4/6] jbd: use list_head for the list of buffers on a transaction's data

use struct list_head for doubly-linked list of buffers on a transaction's
data, metadata or forget queue.

Signed-off-by: Akinobu Mita <mita <at> miraclelinux.com>

---

 fs/jbd/checkpoint.c          |   12 ++--
 fs/jbd/commit.c              |   79 ++++++++++++++++--------------
 fs/jbd/journal.c             |    1 
 fs/jbd/transaction.c         |  110 ++++++++-----------------------------------
 include/linux/jbd.h          |   20 +++----
 include/linux/journal-head.h |    2 
 6 files changed, 80 insertions(+), 144 deletions(-)

diff -X 2.6.13-mm1/Documentation/dontdiff -Nurp 2.6.13-mm1.old/fs/jbd/checkpoint.c 2.6.13-mm1/fs/jbd/checkpoint.c
--- 2.6.13-mm1.old/fs/jbd/checkpoint.c	2005-09-05 03:15:17.000000000 +0900
+++ 2.6.13-mm1/fs/jbd/checkpoint.c	2005-09-05 03:15:35.000000000 +0900
 <at>  <at>  -684,12 +684,12  <at>  <at>  void __journal_drop_transaction(journal_
 	}

 	J_ASSERT(transaction->t_state == T_FINISHED);
-	J_ASSERT(transaction->t_buffers == NULL);
-	J_ASSERT(transaction->t_sync_datalist == NULL);
-	J_ASSERT(transaction->t_forget == NULL);
-	J_ASSERT(transaction->t_iobuf_list == NULL);
-	J_ASSERT(transaction->t_shadow_list == NULL);
-	J_ASSERT(transaction->t_log_list == NULL);
+	J_ASSERT(list_empty(&transaction->t_metadata_list));
+	J_ASSERT(list_empty(&transaction->t_syncdata_list));

(Continue reading)

Akinobu Mita | 9 Sep 2005 10:48

[-mm PATCH 5/6] jbd: use list_head for the list of all transactions waiting for

use struct list_head for a linked circular list of all transactions
waiting for checkpointing on a journal control structure.

Signed-off-by: Akinobu Mita <mita <at> miraclelinux.com>

---

 fs/jbd/checkpoint.c  |   48 ++++++++++++++++++++----------------------------
 fs/jbd/commit.c      |   16 ++--------------
 fs/jbd/journal.c     |    9 +++++----
 fs/jbd/transaction.c |    1 +
 include/linux/jbd.h  |    4 ++--
 5 files changed, 30 insertions(+), 48 deletions(-)

diff -X 2.6.13-mm1/Documentation/dontdiff -Nurp 2.6.13-mm1.old/fs/jbd/checkpoint.c 2.6.13-mm1/fs/jbd/checkpoint.c
--- 2.6.13-mm1.old/fs/jbd/checkpoint.c	2005-09-04 23:31:48.000000000 +0900
+++ 2.6.13-mm1/fs/jbd/checkpoint.c	2005-09-05 00:23:28.000000000 +0900
 <at>  <at>  -180,8 +180,10  <at>  <at>  static void __wait_cp_io(journal_t *jour
 	this_tid = transaction->t_tid;
 restart:
 	/* Didn't somebody clean up the transaction in the meanwhile */
-	if (journal->j_checkpoint_transactions != transaction ||
-		transaction->t_tid != this_tid)
+	if (list_empty(&journal->j_checkpoint_transactions) ||
+	    list_entry(journal->j_checkpoint_transactions.next, transaction_t,
+			t_cplist) != transaction ||
+	    transaction->t_tid != this_tid)
 		return;
 	while (!released && transaction->t_checkpoint_io_list) {
 		jh = transaction->t_checkpoint_io_list;

(Continue reading)

Akinobu Mita | 9 Sep 2005 10:50

[-mm PATCH 6/6] jbd: use list_head for a transaction checkpoint list

use struct list_head for doubly-linked list of buffers still remaining to be
flushed before an old transaction can be checkpointed.

Signed-off-by: Akinobu Mita <mita <at> miraclelinux.com>

---

 fs/jbd/checkpoint.c          |  119 +++++++------------------------------------
 fs/jbd/commit.c              |    4 -
 fs/jbd/journal.c             |    1 
 fs/jbd/transaction.c         |    2 
 include/linux/jbd.h          |    4 -
 include/linux/journal-head.h |    2 
 6 files changed, 30 insertions(+), 102 deletions(-)

diff -X 2.6.13-mm1/Documentation/dontdiff -Nurp 2.6.13-mm1.old/fs/jbd/checkpoint.c 2.6.13-mm1/fs/jbd/checkpoint.c
--- 2.6.13-mm1.old/fs/jbd/checkpoint.c	2005-09-05 03:21:20.000000000 +0900
+++ 2.6.13-mm1/fs/jbd/checkpoint.c	2005-09-05 03:21:33.000000000 +0900
 <at>  <at>  -22,71 +22,7  <at>  <at> 
 #include <linux/jbd.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-
-/*
- * Unlink a buffer from a transaction checkpoint list.
- *
- * Called with j_list_lock held.
- */
-
-static void __buffer_unlink_first(struct journal_head *jh)

(Continue reading)

Andrew Morton | 9 Sep 2005 11:15

Re: [PATCH 0/6] jbd cleanup

Akinobu Mita <mita <at> miraclelinux.com> wrote:
>
> The following 6 patches cleanup the jbd code and kill about 200 lines. 
>

Thanks, but I'm not inclined to apply them.

a) Maybe 70-80% of the Linux world uses this filesystem.  We need to be
   very cautious in making changes to it.

b) A relatively large number of people are carrying quite large
   out-of-tree patches, some of which they're hoping to merge sometime. 
   Admittedly more against ext3 than JBD, but there is potential here to
   cause those people trouble.

Plus the switch to list_heads in journal_s has some impact on type safety
and debuggability - I considered doing it years ago but decided not to
because I found I _used_ those pointers fairly commonly in development. 
list_heads are a bit of a pain in gdb (kgdb and kernel core dumps), for
example.

Theodore Ts'o | 9 Sep 2005 20:16

Picon

Picon

Re: [PATCH 1/6] jbd: remove duplicated debug print

On Fri, Sep 09, 2005 at 05:43:42PM +0900, Akinobu Mita wrote:
> remove duplicated debug print

> -	jbd_debug(3, "JBD: commit phase 2\n");
> -

If you're going to do this, please renumber the rest of the "commit
phase n" messages.  Or the debugging messages will look very funny.

						- Ted

Akinobu Mita | 10 Sep 2005 16:36

Re: [PATCH 1/6] jbd: remove duplicated debug print

On Fri, Sep 09, 2005 at 02:16:49PM -0400, Theodore Ts'o wrote:
> On Fri, Sep 09, 2005 at 05:43:42PM +0900, Akinobu Mita wrote:
> > remove duplicated debug print
> 
> > -	jbd_debug(3, "JBD: commit phase 2\n");
> > -
> 
> If you're going to do this, please renumber the rest of the "commit
> phase n" messages.  Or the debugging messages will look very funny.

The second duplicated "commit phase 2" only does:

 	J_ASSERT (commit_transaction->t_sync_datalist == NULL);

So I thought it might be accidentaly inserted.
diff -U 9 :

--- ./fs/jbd/commit.c.orig	2005-09-10 22:09:05.000000000 +0900
+++ ./fs/jbd/commit.c	2005-09-10 22:09:25.000000000 +0900
 <at>  <at>  -419,20 +419,18  <at>  <at>  write_out_data:
 		cond_resched_lock(&journal->j_list_lock);
 	}
 	spin_unlock(&journal->j_list_lock);

 	if (err)
 		__journal_abort_hard(journal);

 	journal_write_revoke_records(journal, commit_transaction);

-	jbd_debug(3, "JBD: commit phase 2\n");

(Continue reading)

Group

gmane.comp.file-systems.ext3.user.

Search Archive

Page

1 | 2 | 3

Articles in period: 27

September 2005

Language

Change language

Options

Current view: Threads only / Showing only 20 lines / Not hiding cited text.
Change to All messages, whole messages, or hide cited text.

Post a message
NNTP Newsgroup
Classic Gmane web interface
XML

XML

RSS Feed
List Information

About Gmane

Recent entries

(LONG) Delay when writing to ext4 LVM after boot (24 Apr 2013)
e2freefrag says filesystem too large (26 Mar 2013)
ext4 and extremely slow filesystem traversal (13 Mar 2013)
Need information about journal abortion and its relation with remounti (7 Nov 2012)
Relation between aborted journal and read only file system (25 Oct 2012)
bind mounts, chroots, and mismatching kernel with userland (15 Aug 2012)
resize too large (7 Aug 2012)
resize too large (4 Aug 2012)
Filesystem is busy after umount and won't fsck (14 Jun 2012)
Proper stride and stripe-width for RAID 50 (5 Jun 2012)
Milos rovcanin ti je poslao poruku... (19 Apr 2012)
Strange behaviour during file rename (2 Mar 2012)
Trace ACL updates to an ext3 inode (1 Jan 2012)
Pročitaj poruku pre nego što bude obrisana! (25 Dec 2011)
Milos rovcanin ti je poslao poruku... (17 Dec 2011)
damaged encrypted LUKS device (26 Nov 2011)
High CPU Utilization When Copying to Ext4 (5 Nov 2011)
power outage turned raid ext3 into ext2, how to fix ? (17 Oct 2011)
ext3 with maildir++ = huge disk latency and high load (29 Sep 2011)
ext3 with maildir++ = huge disk latency and high load (23 Sep 2011)
Fwd: Re: ext3 with maildir++ = huge disk latency and high load (23 Sep 2011)

Archives

2	April 2013
19	March 2013
5	January 2013
1	November 2012
1	October 2012
2	September 2012
8	August 2012
4	June 2012
1	April 2012
3	March 2012
1	January 2012
2	December 2011
9	November 2011
1	October 2011
21	September 2011
1	July 2011
20	June 2011
6	May 2011
11	April 2011
29	March 2011
14	February 2011
18	January 2011
18	December 2010
25	November 2010
22	October 2010
3	September 2010
6	August 2010
9	July 2010
11	June 2010
18	May 2010
8	April 2010
44	March 2010
43	February 2010
18	January 2010
20	December 2009
7	November 2009
7	October 2009
19	September 2009
9	August 2009
8	July 2009
72	June 2009
36	May 2009
44	April 2009
41	March 2009
63	February 2009
41	January 2009
50	December 2008
15	November 2008
45	October 2008
69	September 2008
31	August 2008
39	July 2008
70	June 2008
41	May 2008
28	April 2008
77	March 2008
36	February 2008
67	January 2008
15	December 2007
13	November 2007
35	October 2007
54	September 2007
27	August 2007
43	July 2007
29	June 2007
55	May 2007
48	April 2007
61	March 2007
43	February 2007
26	January 2007
35	December 2006
46	November 2006
54	October 2006
55	September 2006
47	August 2006
41	July 2006
45	June 2006
30	May 2006
88	April 2006
37	March 2006
23	February 2006
43	January 2006
29	December 2005
54	November 2005
21	October 2005
27	September 2005
13	August 2005
33	July 2005
45	June 2005
33	May 2005
36	April 2005
37	March 2005
72	February 2005
35	January 2005
36	December 2004
16	November 2004
23	October 2004
35	September 2004
15	August 2004
54	July 2004
54	June 2004
40	May 2004
69	April 2004
123	March 2004
64	February 2004
49	January 2004
57	December 2003
45	November 2003
50	October 2003
36	September 2003
74	August 2003
50	July 2003
120	June 2003
97	May 2003
99	April 2003
132	March 2003
146	February 2003
102	January 2003
133	December 2002
104	November 2002
174	October 2002
164	September 2002

Design

Zawodny | Right Menu | Left Menu

Your Own Design

Paste the URL of your CSS below. Download CSS template