head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.26 perseant-exfatfs-base:1.2 cjep_sun2x:1.2.0.24 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.22 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 pgoyette-compat-0728:1.2 pgoyette-compat-0625:1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 pgoyette-compat:1.2.0.20 pgoyette-compat-base:1.2 perseant-stdc-iso10646:1.2.0.18 perseant-stdc-iso10646-base:1.2 prg-localcount2-base3:1.2 prg-localcount2-base2:1.2 prg-localcount2-base1:1.2 prg-localcount2:1.2.0.16 prg-localcount2-base:1.2 pgoyette-localcount-20170426:1.2 bouyer-socketcan-base1:1.2 pgoyette-localcount-20170320:1.2 bouyer-socketcan:1.2.0.14 bouyer-socketcan-base:1.2 pgoyette-localcount-20170107:1.2 pgoyette-localcount-20161104:1.2 localcount-20160914:1.2 pgoyette-localcount-20160806:1.2 pgoyette-localcount-20160726:1.2 pgoyette-localcount:1.2.0.12 pgoyette-localcount-base:1.2 netbsd-5-2-3-RELEASE:1.1.1.1.8.1 netbsd-5-1-5-RELEASE:1.1.1.1.8.1 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.2 tls-earlyentropy:1.2.0.8 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 netbsd-5-2-2-RELEASE:1.1.1.1.8.1 netbsd-5-1-4-RELEASE:1.1.1.1.8.1 netbsd-5-2-1-RELEASE:1.1.1.1.8.1 netbsd-5-1-3-RELEASE:1.1.1.1.8.1 agc-symver:1.2.0.10 agc-symver-base:1.2 tls-maxphys-base:1.2 yamt-pagecache-base8:1.2 netbsd-5-2:1.1.1.1.8.1.0.6 yamt-pagecache-base7:1.2 netbsd-5-2-RELEASE:1.1.1.1.8.1 netbsd-5-2-RC1:1.1.1.1.8.1 yamt-pagecache-base6:1.2 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 netbsd-5-1-2-RELEASE:1.1.1.1.8.1 netbsd-5-1-1-RELEASE:1.1.1.1.8.1 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.6 yamt-pagecache-base:1.2 bouyer-quota2-nbase:1.2 bouyer-quota2:1.2.0.4 bouyer-quota2-base:1.2 matt-nb5-pq3:1.1.1.1.8.1.0.4 matt-nb5-pq3-base:1.1.1.1.8.1 netbsd-5-1:1.1.1.1.8.1.0.2 netbsd-5-1-RELEASE:1.1.1.1.8.1 netbsd-5-1-RC4:1.1.1.1.8.1 netbsd-5-1-RC3:1.1.1.1.8.1 netbsd-5-1-RC2:1.1.1.1.8.1 netbsd-5-1-RC1:1.1.1.1.8.1 netbsd-5-0-2-RELEASE:1.1.1.1 matt-nb5-mips64-premerge-20091211:1.1.1.1 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1.1.1 matt-nb4-mips64-k7-u2a-k9b:1.1.1.1 matt-nb5-mips64-u1-k1-k5:1.1.1.1 matt-nb5-mips64:1.1.1.1.0.12 netbsd-5-0-1-RELEASE:1.1.1.1 jym-xensuspend-nbase:1.2 netbsd-5-0:1.1.1.1.0.10 netbsd-5-0-RELEASE:1.1.1.1 netbsd-5-0-RC4:1.1.1.1 netbsd-5-0-RC3:1.1.1.1 netbsd-5-0-RC2:1.1.1.1 jym-xensuspend:1.2.0.2 jym-xensuspend-base:1.2 netbsd-5-0-RC1:1.1.1.1 haad-dm-base2:1.1.1.1 haad-nbase2:1.1.1.1 netbsd-5:1.1.1.1.0.8 netbsd-5-base:1.1.1.1 matt-mips64-base2:1.1.1.1 haad-dm-base1:1.1.1.1 wrstuden-revivesa-base-3:1.1.1.1 wrstuden-revivesa:1.1.1.1.0.4 wrstuden-revivesa-base-2:1.1.1.1 haad-dm:1.1.1.1.0.2 haad-dm-base:1.1.1.1 libdevmapper-1-02-27:1.1.1.1 FSF:1.1.1; locks; strict; comment @# @; 1.2 date 2008.12.22.01.07.19; author haad; state dead; branches; next 1.1; 1.1 date 2008.07.15.13.52.54; author haad; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.07.15.13.52.54; author haad; state Exp; branches 1.1.1.1.2.1 1.1.1.1.4.1 1.1.1.1.8.1 1.1.1.1.12.1; next ; 1.1.1.1.2.1 date 2008.07.15.13.52.54; author haad; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2008.12.16.01.27.02; author haad; state dead; branches; next ; 1.1.1.1.4.1 date 2008.07.15.13.52.54; author wrstuden; state dead; branches; next 1.1.1.1.4.2; 1.1.1.1.4.2 date 2008.09.18.05.17.12; author wrstuden; state Exp; branches; next ; 1.1.1.1.8.1 date 2010.01.20.05.13.25; author snj; state dead; branches; next ; 1.1.1.1.12.1 date 2010.04.21.05.23.14; author matt; state dead; branches; next ; desc @@ 1.2 log @Remove broken merged sources of haad-dm. lvm2tools are now in gpl2/lvm2 and libdevmapper is not needed anymore. @ text @diff -ruN linux-2.4.20/fs/buffer.c linux/fs/buffer.c --- linux-2.4.20/fs/buffer.c Fri Jan 10 16:35:24 2003 +++ linux/fs/buffer.c Wed Mar 26 12:53:19 2003 @@@@ -586,9 +586,10 @@@@ void buffer_insert_inode_queue(struct buffer_head *bh, struct inode *inode) { spin_lock(&lru_list_lock); - if (bh->b_inode) + if (buffer_inode(bh)) list_del(&bh->b_inode_buffers); - bh->b_inode = inode; + else + set_buffer_inode(bh); list_add(&bh->b_inode_buffers, &inode->i_dirty_buffers); spin_unlock(&lru_list_lock); } @@@@ -596,9 +597,10 @@@@ void buffer_insert_inode_data_queue(struct buffer_head *bh, struct inode *inode) { spin_lock(&lru_list_lock); - if (bh->b_inode) + if (buffer_inode(bh)) list_del(&bh->b_inode_buffers); - bh->b_inode = inode; + else + set_buffer_inode(bh); list_add(&bh->b_inode_buffers, &inode->i_dirty_data_buffers); spin_unlock(&lru_list_lock); } @@@@ -607,13 +609,13 @@@@ remove_inode_queue functions. */ static void __remove_inode_queue(struct buffer_head *bh) { - bh->b_inode = NULL; + clear_buffer_inode(bh); list_del(&bh->b_inode_buffers); } static inline void remove_inode_queue(struct buffer_head *bh) { - if (bh->b_inode) + if (buffer_inode(bh)) __remove_inode_queue(bh); } @@@@ -741,6 +743,7 @@@@ bh->b_list = BUF_CLEAN; bh->b_end_io = handler; bh->b_private = private; + bh->b_journal_head = NULL; } static void end_buffer_io_async(struct buffer_head * bh, int uptodate) @@@@ -842,9 +845,9 @@@@ bh = BH_ENTRY(list->next); list_del(&bh->b_inode_buffers); if (!buffer_dirty(bh) && !buffer_locked(bh)) - bh->b_inode = NULL; + clear_buffer_inode(bh); else { - bh->b_inode = &tmp; + set_buffer_inode(bh); list_add(&bh->b_inode_buffers, &tmp.i_dirty_buffers); if (buffer_dirty(bh)) { get_bh(bh); @@@@ -1138,7 +1141,7 @@@@ */ static void __put_unused_buffer_head(struct buffer_head * bh) { - if (bh->b_inode) + if (buffer_inode(bh)) BUG(); if (nr_unused_buffer_heads >= MAX_UNUSED_BUFFERS) { kmem_cache_free(bh_cachep, bh); diff -ruN linux-2.4.20/fs/jbd/journal.c linux/fs/jbd/journal.c --- linux-2.4.20/fs/jbd/journal.c Fri Jan 10 16:35:27 2003 +++ linux/fs/jbd/journal.c Wed Mar 26 12:53:19 2003 @@@@ -1664,8 +1664,8 @@@@ * * Whenever a buffer has an attached journal_head, its ->b_state:BH_JBD bit * is set. This bit is tested in core kernel code where we need to take - * JBD-specific actions. Testing the zeroness of ->b_private is not reliable - * there. + * JBD-specific actions. Testing the zeroness of ->b_journal_head is not + * reliable there. * * When a buffer has its BH_JBD bit set, its ->b_count is elevated by one. * @@@@ -1720,9 +1720,9 @@@@ if (buffer_jbd(bh)) { /* Someone did it for us! */ - J_ASSERT_BH(bh, bh->b_private != NULL); + J_ASSERT_BH(bh, bh->b_journal_head != NULL); journal_free_journal_head(jh); - jh = bh->b_private; + jh = bh->b_journal_head; } else { /* * We actually don't need jh_splice_lock when @@@@ -1730,7 +1730,7 @@@@ */ spin_lock(&jh_splice_lock); set_bit(BH_JBD, &bh->b_state); - bh->b_private = jh; + bh->b_journal_head = jh; jh->b_bh = bh; atomic_inc(&bh->b_count); spin_unlock(&jh_splice_lock); @@@@ -1739,7 +1739,7 @@@@ } jh->b_jcount++; spin_unlock(&journal_datalist_lock); - return bh->b_private; + return bh->b_journal_head; } /* @@@@ -1772,7 +1772,7 @@@@ J_ASSERT_BH(bh, jh2bh(jh) == bh); BUFFER_TRACE(bh, "remove journal_head"); spin_lock(&jh_splice_lock); - bh->b_private = NULL; + bh->b_journal_head = NULL; jh->b_bh = NULL; /* debug, really */ clear_bit(BH_JBD, &bh->b_state); __brelse(bh); diff -ruN linux-2.4.20/include/linux/fs.h linux/include/linux/fs.h --- linux-2.4.20/include/linux/fs.h Fri Jan 10 16:35:55 2003 +++ linux/include/linux/fs.h Wed Mar 26 12:53:19 2003 @@@@ -220,6 +220,7 @@@@ BH_Wait_IO, /* 1 if we should write out this buffer */ BH_Launder, /* 1 if we can throttle on this buffer */ BH_JBD, /* 1 if it has an attached journal_head */ + BH_Inode, /* 1 if it is attached to i_dirty[_data]_buffers */ BH_PrivateStart,/* not a state bit, but the first bit available * for private allocation by other entities @@@@ -262,11 +263,10 @@@@ struct page *b_page; /* the page this bh is mapped to */ void (*b_end_io)(struct buffer_head *bh, int uptodate); /* I/O completion */ void *b_private; /* reserved for b_end_io */ - + void *b_journal_head; /* ext3 journal_heads */ unsigned long b_rsector; /* Real buffer location on disk */ wait_queue_head_t b_wait; - struct inode * b_inode; struct list_head b_inode_buffers; /* doubly linked list of inode dirty buffers */ }; @@@@ -1184,6 +1184,21 @@@@ set_bit(BH_Async, &bh->b_state); else clear_bit(BH_Async, &bh->b_state); +} + +static inline void set_buffer_inode(struct buffer_head *bh) +{ + set_bit(BH_Inode, &bh->b_state); +} + +static inline void clear_buffer_inode(struct buffer_head *bh) +{ + clear_bit(BH_Inode, &bh->b_state); +} + +static inline int buffer_inode(struct buffer_head *bh) +{ + return test_bit(BH_Inode, &bh->b_state); } /* diff -ruN linux-2.4.20/include/linux/jbd.h linux/include/linux/jbd.h --- linux-2.4.20/include/linux/jbd.h Fri Jan 10 16:35:55 2003 +++ linux/include/linux/jbd.h Wed Mar 26 12:53:19 2003 @@@@ -254,7 +254,7 @@@@ static inline struct journal_head *bh2jh(struct buffer_head *bh) { - return bh->b_private; + return bh->b_journal_head; } #define HAVE_JOURNAL_CALLBACK_STATUS @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @version 1.02.27-cvs @ text @@ 1.1.1.1.2.1 log @file linux-2.4.20-b_private.patch was added on branch haad-dm on 2008-12-16 01:27:02 +0000 @ text @d1 185 @ 1.1.1.1.2.2 log @Remove libdevmaper code, lvm2tools are now distributed with libdevmapper source inside. @ text @@ 1.1.1.1.12.1 log @sync to netbsd-5 @ text @@ 1.1.1.1.8.1 log @Remove obsolete LVM sources, as requested by tron in ticket 1211. @ text @@ 1.1.1.1.4.1 log @file linux-2.4.20-b_private.patch was added on branch wrstuden-revivesa on 2008-09-18 05:17:12 +0000 @ text @d1 185 @ 1.1.1.1.4.2 log @Sync with wrstuden-revivesa-base-2. @ text @a0 185 diff -ruN linux-2.4.20/fs/buffer.c linux/fs/buffer.c --- linux-2.4.20/fs/buffer.c Fri Jan 10 16:35:24 2003 +++ linux/fs/buffer.c Wed Mar 26 12:53:19 2003 @@@@ -586,9 +586,10 @@@@ void buffer_insert_inode_queue(struct buffer_head *bh, struct inode *inode) { spin_lock(&lru_list_lock); - if (bh->b_inode) + if (buffer_inode(bh)) list_del(&bh->b_inode_buffers); - bh->b_inode = inode; + else + set_buffer_inode(bh); list_add(&bh->b_inode_buffers, &inode->i_dirty_buffers); spin_unlock(&lru_list_lock); } @@@@ -596,9 +597,10 @@@@ void buffer_insert_inode_data_queue(struct buffer_head *bh, struct inode *inode) { spin_lock(&lru_list_lock); - if (bh->b_inode) + if (buffer_inode(bh)) list_del(&bh->b_inode_buffers); - bh->b_inode = inode; + else + set_buffer_inode(bh); list_add(&bh->b_inode_buffers, &inode->i_dirty_data_buffers); spin_unlock(&lru_list_lock); } @@@@ -607,13 +609,13 @@@@ remove_inode_queue functions. */ static void __remove_inode_queue(struct buffer_head *bh) { - bh->b_inode = NULL; + clear_buffer_inode(bh); list_del(&bh->b_inode_buffers); } static inline void remove_inode_queue(struct buffer_head *bh) { - if (bh->b_inode) + if (buffer_inode(bh)) __remove_inode_queue(bh); } @@@@ -741,6 +743,7 @@@@ bh->b_list = BUF_CLEAN; bh->b_end_io = handler; bh->b_private = private; + bh->b_journal_head = NULL; } static void end_buffer_io_async(struct buffer_head * bh, int uptodate) @@@@ -842,9 +845,9 @@@@ bh = BH_ENTRY(list->next); list_del(&bh->b_inode_buffers); if (!buffer_dirty(bh) && !buffer_locked(bh)) - bh->b_inode = NULL; + clear_buffer_inode(bh); else { - bh->b_inode = &tmp; + set_buffer_inode(bh); list_add(&bh->b_inode_buffers, &tmp.i_dirty_buffers); if (buffer_dirty(bh)) { get_bh(bh); @@@@ -1138,7 +1141,7 @@@@ */ static void __put_unused_buffer_head(struct buffer_head * bh) { - if (bh->b_inode) + if (buffer_inode(bh)) BUG(); if (nr_unused_buffer_heads >= MAX_UNUSED_BUFFERS) { kmem_cache_free(bh_cachep, bh); diff -ruN linux-2.4.20/fs/jbd/journal.c linux/fs/jbd/journal.c --- linux-2.4.20/fs/jbd/journal.c Fri Jan 10 16:35:27 2003 +++ linux/fs/jbd/journal.c Wed Mar 26 12:53:19 2003 @@@@ -1664,8 +1664,8 @@@@ * * Whenever a buffer has an attached journal_head, its ->b_state:BH_JBD bit * is set. This bit is tested in core kernel code where we need to take - * JBD-specific actions. Testing the zeroness of ->b_private is not reliable - * there. + * JBD-specific actions. Testing the zeroness of ->b_journal_head is not + * reliable there. * * When a buffer has its BH_JBD bit set, its ->b_count is elevated by one. * @@@@ -1720,9 +1720,9 @@@@ if (buffer_jbd(bh)) { /* Someone did it for us! */ - J_ASSERT_BH(bh, bh->b_private != NULL); + J_ASSERT_BH(bh, bh->b_journal_head != NULL); journal_free_journal_head(jh); - jh = bh->b_private; + jh = bh->b_journal_head; } else { /* * We actually don't need jh_splice_lock when @@@@ -1730,7 +1730,7 @@@@ */ spin_lock(&jh_splice_lock); set_bit(BH_JBD, &bh->b_state); - bh->b_private = jh; + bh->b_journal_head = jh; jh->b_bh = bh; atomic_inc(&bh->b_count); spin_unlock(&jh_splice_lock); @@@@ -1739,7 +1739,7 @@@@ } jh->b_jcount++; spin_unlock(&journal_datalist_lock); - return bh->b_private; + return bh->b_journal_head; } /* @@@@ -1772,7 +1772,7 @@@@ J_ASSERT_BH(bh, jh2bh(jh) == bh); BUFFER_TRACE(bh, "remove journal_head"); spin_lock(&jh_splice_lock); - bh->b_private = NULL; + bh->b_journal_head = NULL; jh->b_bh = NULL; /* debug, really */ clear_bit(BH_JBD, &bh->b_state); __brelse(bh); diff -ruN linux-2.4.20/include/linux/fs.h linux/include/linux/fs.h --- linux-2.4.20/include/linux/fs.h Fri Jan 10 16:35:55 2003 +++ linux/include/linux/fs.h Wed Mar 26 12:53:19 2003 @@@@ -220,6 +220,7 @@@@ BH_Wait_IO, /* 1 if we should write out this buffer */ BH_Launder, /* 1 if we can throttle on this buffer */ BH_JBD, /* 1 if it has an attached journal_head */ + BH_Inode, /* 1 if it is attached to i_dirty[_data]_buffers */ BH_PrivateStart,/* not a state bit, but the first bit available * for private allocation by other entities @@@@ -262,11 +263,10 @@@@ struct page *b_page; /* the page this bh is mapped to */ void (*b_end_io)(struct buffer_head *bh, int uptodate); /* I/O completion */ void *b_private; /* reserved for b_end_io */ - + void *b_journal_head; /* ext3 journal_heads */ unsigned long b_rsector; /* Real buffer location on disk */ wait_queue_head_t b_wait; - struct inode * b_inode; struct list_head b_inode_buffers; /* doubly linked list of inode dirty buffers */ }; @@@@ -1184,6 +1184,21 @@@@ set_bit(BH_Async, &bh->b_state); else clear_bit(BH_Async, &bh->b_state); +} + +static inline void set_buffer_inode(struct buffer_head *bh) +{ + set_bit(BH_Inode, &bh->b_state); +} + +static inline void clear_buffer_inode(struct buffer_head *bh) +{ + clear_bit(BH_Inode, &bh->b_state); +} + +static inline int buffer_inode(struct buffer_head *bh) +{ + return test_bit(BH_Inode, &bh->b_state); } /* diff -ruN linux-2.4.20/include/linux/jbd.h linux/include/linux/jbd.h --- linux-2.4.20/include/linux/jbd.h Fri Jan 10 16:35:55 2003 +++ linux/include/linux/jbd.h Wed Mar 26 12:53:19 2003 @@@@ -254,7 +254,7 @@@@ static inline struct journal_head *bh2jh(struct buffer_head *bh) { - return bh->b_private; + return bh->b_journal_head; } #define HAVE_JOURNAL_CALLBACK_STATUS @