← Back to branch summary

~ubuntu-branches/ubuntu/breezy/devmapper/breezy

« back to all changes in this revision

Viewing changes to patches/common/linux-2.4.27-b_private.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2005-07-07 16:40:17 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050707164017-xlkhemut9i756da6
Tags: 2:1.01.03-1ubuntu2
debian/libdevmapper1.01.preinst: Fix removal of the old init script to
avoid update-rc.d error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/common/linux-2.4.27-b_private.patch
 
1
--- linux-2.4.27/fs/buffer.c    2004-10-14 11:06:55.000000000 -0500
 
2
+++ linux/fs/buffer.c   2004-10-14 14:21:05.173812484 -0500
 
3
@@ -799,6 +799,7 @@
 
4
        bh->b_list = BUF_CLEAN;
 
5
        bh->b_end_io = handler;
 
6
        bh->b_private = private;
 
7
+       bh->b_journal_head = NULL;
 
8
 }
 
9
 
 
10
 void end_buffer_io_async(struct buffer_head * bh, int uptodate)
 
11
--- linux-2.4.27/fs/jbd/journal.c       2004-10-14 11:06:55.000000000 -0500
 
12
+++ linux/fs/jbd/journal.c      2004-10-14 14:21:05.188810355 -0500
 
13
@@ -1804,9 +1804,9 @@
 
14
 
 
15
                if (buffer_jbd(bh)) {
 
16
                        /* Someone did it for us! */
 
17
-                       J_ASSERT_BH(bh, bh->b_private != NULL);
 
18
+                       J_ASSERT_BH(bh, bh->b_journal_head != NULL);
 
19
                        journal_free_journal_head(jh);
 
20
-                       jh = bh->b_private;
 
21
+                       jh = bh->b_journal_head;
 
22
                } else {
 
23
                        /*
 
24
                         * We actually don't need jh_splice_lock when
 
25
@@ -1814,7 +1814,7 @@
 
26
                         */
 
27
                        spin_lock(&jh_splice_lock);
 
28
                        set_bit(BH_JBD, &bh->b_state);
 
29
-                       bh->b_private = jh;
 
30
+                       bh->b_journal_head = jh;
 
31
                        jh->b_bh = bh;
 
32
                        atomic_inc(&bh->b_count);
 
33
                        spin_unlock(&jh_splice_lock);
 
34
@@ -1823,7 +1823,7 @@
 
35
        }
 
36
        jh->b_jcount++;
 
37
        spin_unlock(&journal_datalist_lock);
 
38
-       return bh->b_private;
 
39
+       return bh->b_journal_head;
 
40
 }
 
41
 
 
42
 /*
 
43
@@ -1856,7 +1856,7 @@
 
44
                        J_ASSERT_BH(bh, jh2bh(jh) == bh);
 
45
                        BUFFER_TRACE(bh, "remove journal_head");
 
46
                        spin_lock(&jh_splice_lock);
 
47
-                       bh->b_private = NULL;
 
48
+                       bh->b_journal_head = NULL;
 
49
                        jh->b_bh = NULL;        /* debug, really */
 
50
                        clear_bit(BH_JBD, &bh->b_state);
 
51
                        __brelse(bh);
 
52
--- linux-2.4.27/include/linux/fs.h     2004-10-14 11:07:15.000000000 -0500
 
53
+++ linux/include/linux/fs.h    2004-10-14 14:21:05.211807091 -0500
 
54
@@ -266,7 +266,7 @@
 
55
        struct page *b_page;            /* the page this bh is mapped to */
 
56
        void (*b_end_io)(struct buffer_head *bh, int uptodate); /* I/O completion */
 
57
        void *b_private;                /* reserved for b_end_io */
 
58
-
 
59
+       void *b_journal_head;           /* ext3 journal_heads */
 
60
        unsigned long b_rsector;        /* Real buffer location on disk */
 
61
        wait_queue_head_t b_wait;
 
62
 
 
63
--- linux-2.4.27/include/linux/jbd.h    2004-10-14 11:07:14.000000000 -0500
 
64
+++ linux/include/linux/jbd.h   2004-10-14 14:21:05.221805672 -0500
 
65
@@ -311,7 +311,7 @@
 
66
 
 
67
 static inline struct journal_head *bh2jh(struct buffer_head *bh)
 
68
 {
 
69
-       return bh->b_private;
 
70
+       return bh->b_journal_head;
 
71
 }
 
72
 
 
73
 #define HAVE_JOURNAL_CALLBACK_STATUS