Remove old patches

diff --git a/patches/misc/README b/patches/misc/README
index 5388382b8d1605c0c0a0579b66c7087507d4e69d..56d3bf131312190a38c82482fdfb13c7e41ae9e1 100644 (file)
--- a/patches/misc/README
+++ b/patches/misc/README
@@ -1,12 +1,5 @@
-This directory contains miscellaneous patches that developers may find
-useful.
+This directory contains miscellaneous patches.
 
-uml_config - People using uml will need to apply this to be able to 
+uml_config - People using older versions of UML need this to be able to 
              configure dm.
 
-disable_io_hook - This removes the hooking of the b_end_io field in buffer
-                  heads.  suspend/resume of a device will be broken as a
-                  result.
-
-instrument_defer - Useful printk's that I use for checking suspend/resume.
-

diff --git a/patches/misc/disable_io_hook.patch b/patches/misc/disable_io_hook.patch
deleted file mode 100644 (file)
index bbac14b..0000000
--- a/patches/misc/disable_io_hook.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- linux-last/drivers/md/dm.c Wed Nov 14 14:42:24 2001
-+++ linux/drivers/md/dm.c      Thu Nov 15 10:29:35 2001
-@@ -319,39 +319,12 @@
-       int r;
-       dm_map_fn fn;
-       void *context;
--      struct io_hook *ih = NULL;
-       struct target *ti = md->map->targets + leaf;
- 
-       fn = ti->type->map;
-       context = ti->private;
- 
--      ih = alloc_io_hook();
--
--      if (!ih)
--              return 0;
--
--      ih->md = md;
--      ih->rw = rw;
--      ih->target = ti;
--      ih->end_io = bh->b_end_io;
--      ih->context = bh->b_private;
--
-       r = fn(bh, rw, context);
--
--      if (r > 0) {
--              /* hook the end io request fn */
--              atomic_inc(&md->pending);
--              bh->b_end_io = dec_pending;
--              bh->b_private = ih;
--
--      } else if (r == 0)
--              /* we don't need to hook */
--              free_io_hook(ih);
--
--      else if (r < 0) {
--              free_io_hook(ih);
--              return 0;
--      }
- 
-       return 1;
- }

diff --git a/patches/misc/instrument_defer.patch b/patches/misc/instrument_defer.patch
deleted file mode 100644 (file)
index 2998b0c..0000000
--- a/patches/misc/instrument_defer.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- linux-last//drivers/md/dm.c        Tue Nov  6 16:29:32 2001
-+++ linux/drivers/md/dm.c      Tue Nov  6 18:45:55 2001
-@@ -283,6 +283,7 @@
-       bh->b_private = ih->context;
-       free_io_hook(ih);
- 
-+      WARN("calling end_io on bh %d, %lu", bh->b_rdev, bh->b_rsector);
-       bh->b_end_io(bh, uptodate);
- }
- 
-@@ -306,6 +307,9 @@
-       di->rw = rw;
-       di->next = md->deferred;
-       md->deferred = di;
-+
-+      WARN("defering bh %d, %lu", bh->b_rdev, bh->b_rsector);
-+
-       wu;
- 
-       return 1;
-@@ -829,6 +837,9 @@
- 
-       while (c) {
-               n = c->next;
-+
-+              WARN("flushing bh %d, %lu", c->bh->b_rdev, c->bh->b_rsector);
-+
-               generic_make_request(c->rw, c->bh);
-               free_deferred(c);
-               c = n;

diff --git a/patches/misc/linux-2.4.19-VFS-lock.patch b/patches/misc/linux-2.4.19-VFS-lock.patch
deleted file mode 100644 (file)
index 8ae5dd2..0000000
--- a/patches/misc/linux-2.4.19-VFS-lock.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff -Nru a/drivers/md/lvm.c b/drivers/md/lvm.c
---- a/drivers/md/lvm.c Wed May 22 10:43:49 2002
-+++ b/drivers/md/lvm.c Wed May 22 10:43:49 2002
-@@ -223,9 +223,6 @@
- #define DEVICE_OFF(device)
- #define LOCAL_END_REQUEST
- 
--/* lvm_do_lv_create calls fsync_dev_lockfs()/unlockfs() */
--/* #define    LVM_VFS_ENHANCEMENT */
--
- #include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -2178,12 +2175,8 @@
-       if (lv_ptr->lv_access & LV_SNAPSHOT) {
-               lv_t *org = lv_ptr->lv_snapshot_org, *last;
- 
--              /* sync the original logical volume */
--              fsync_dev(org->lv_dev);
--#ifdef        LVM_VFS_ENHANCEMENT
-               /* VFS function call to sync and lock the filesystem */
-               fsync_dev_lockfs(org->lv_dev);
--#endif
- 
-               down_write(&org->lv_lock);
-               org->lv_access |= LV_SNAPSHOT_ORG;
-@@ -2209,11 +2202,9 @@
-       else
-               set_device_ro(lv_ptr->lv_dev, 1);
- 
--#ifdef        LVM_VFS_ENHANCEMENT
- /* VFS function call to unlock the filesystem */
-       if (lv_ptr->lv_access & LV_SNAPSHOT)
-               unlockfs(lv_ptr->lv_snapshot_org->lv_dev);
--#endif
- 
-       lvm_gendisk.part[MINOR(lv_ptr->lv_dev)].de =
-           lvm_fs_create_lv(vg_ptr, lv_ptr);
-diff -Nru a/fs/buffer.c b/fs/buffer.c
---- a/fs/buffer.c      Wed May 22 10:43:49 2002
-+++ b/fs/buffer.c      Wed May 22 10:43:49 2002
-@@ -363,6 +363,34 @@
-       fsync_dev(dev);
- }
- 
-+int fsync_dev_lockfs(kdev_t dev)
-+{
-+      /* you are not allowed to try locking all the filesystems
-+      ** on the system, your chances of getting through without
-+      ** total deadlock are slim to none.
-+      */
-+      if (!dev)
-+              return fsync_dev(dev) ;
-+
-+      sync_buffers(dev, 0);
-+
-+      lock_kernel();
-+      /* note, the FS might need to start transactions to 
-+      ** sync the inodes, or the quota, no locking until
-+      ** after these are done
-+      */
-+      sync_inodes(dev);
-+      DQUOT_SYNC(dev);
-+      /* if inodes or quotas could be dirtied during the
-+      ** sync_supers_lockfs call, the FS is responsible for getting
-+      ** them on disk, without deadlocking against the lock
-+      */
-+      sync_supers_lockfs(dev) ;
-+      unlock_kernel();
-+
-+      return sync_buffers(dev, 1) ;
-+}
-+
- asmlinkage long sys_sync(void)
- {
-       fsync_dev(0);
-diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
---- a/fs/reiserfs/super.c      Wed May 22 10:43:49 2002
-+++ b/fs/reiserfs/super.c      Wed May 22 10:43:49 2002
-@@ -66,7 +66,7 @@
-     reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1);
-     journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB (s));
-     reiserfs_block_writes(&th) ;
--    journal_end(&th, s, 1) ;
-+    journal_end_sync(&th, s, 1) ;
-   }
-   s->s_dirt = dirty;
-   unlock_kernel() ;
-diff -Nru a/fs/super.c b/fs/super.c
---- a/fs/super.c       Wed May 22 10:43:49 2002
-+++ b/fs/super.c       Wed May 22 10:43:49 2002
-@@ -37,6 +37,13 @@
- LIST_HEAD(super_blocks);
- spinlock_t sb_lock = SPIN_LOCK_UNLOCKED;
- 
-+/* 
-+ * lock/unlockfs grab a read lock on s_umount, but you need this lock to 
-+ * make sure no lockfs runs are in progress before inserting/removing 
-+ * supers from the list.  
-+ */
-+static DECLARE_MUTEX(lockfs_sem);
-+
- /*
-  * Handling of filesystem drivers list.
-  * Rules:
-@@ -431,6 +438,19 @@
-       put_super(sb);
- }
- 
-+static void write_super_lockfs(struct super_block *sb)
-+{
-+      lock_super(sb);
-+      if (sb->s_root && sb->s_op) {
-+              if (sb->s_dirt && sb->s_op->write_super)
-+                      sb->s_op->write_super(sb);
-+              if (sb->s_op->write_super_lockfs) {
-+                      sb->s_op->write_super_lockfs(sb);
-+              }
-+      }
-+      unlock_super(sb);
-+}
-+
- static inline void write_super(struct super_block *sb)
- {
-       lock_super(sb);
-@@ -474,6 +494,39 @@
-       spin_unlock(&sb_lock);
- }
- 
-+/*
-+ * Note: don't check the dirty flag before waiting, we want the lock
-+ * to happen every time this is called.  dev must be non-zero
-+ */
-+void sync_supers_lockfs(kdev_t dev)
-+{
-+      struct super_block * sb;
-+
-+      down(&lockfs_sem) ;
-+      if (dev) {
-+              sb = get_super(dev);
-+              if (sb) {
-+                      write_super_lockfs(sb);
-+                      drop_super(sb);
-+              }
-+      }
-+}
-+
-+void unlockfs(kdev_t dev)
-+{
-+      struct super_block * sb;
-+
-+      if (dev) {
-+              sb = get_super(dev);
-+              if (sb) {
-+                      if (sb->s_op && sb->s_op->unlockfs)
-+                              sb->s_op->unlockfs(sb) ;
-+                      drop_super(sb);
-+              }
-+      }
-+      up(&lockfs_sem) ;
-+}
-+
- /**
-  *    get_super       -       get the superblock of a device
-  *    @dev: device to get the superblock for
-@@ -694,6 +747,7 @@
-               goto out1;
- 
-       error = -EBUSY;
-+      down(&lockfs_sem);
- restart:
-       spin_lock(&sb_lock);
- 
-@@ -705,6 +759,7 @@
-                   ((flags ^ old->s_flags) & MS_RDONLY)) {
-                       spin_unlock(&sb_lock);
-                       destroy_super(s);
-+                      up(&lockfs_sem);
-                       goto out1;
-               }
-               if (!grab_super(old))
-@@ -712,12 +767,14 @@
-               destroy_super(s);
-               blkdev_put(bdev, BDEV_FS);
-               path_release(&nd);
-+              up(&lockfs_sem);
-               return old;
-       }
-       s->s_dev = dev;
-       s->s_bdev = bdev;
-       s->s_flags = flags;
-       insert_super(s, fs_type);
-+      up(&lockfs_sem);
-       if (!fs_type->read_super(s, data, flags & MS_VERBOSE ? 1 : 0))
-               goto Einval;
-       s->s_flags |= MS_ACTIVE;
-@@ -825,7 +882,10 @@
-       if (!deactivate_super(sb))
-               return;
- 
-+      down(&lockfs_sem);
-       down_write(&sb->s_umount);
-+      up(&lockfs_sem);
-+
-       sb->s_root = NULL;
-       /* Need to clean after the sucker */
-       if (fs->fs_flags & FS_LITTER)
-diff -Nru a/include/linux/fs.h b/include/linux/fs.h
---- a/include/linux/fs.h       Wed May 22 10:43:49 2002
-+++ b/include/linux/fs.h       Wed May 22 10:43:49 2002
-@@ -1218,6 +1218,7 @@
- extern int sync_buffers(kdev_t, int);
- extern void sync_dev(kdev_t);
- extern int fsync_dev(kdev_t);
-+extern int fsync_dev_lockfs(kdev_t);
- extern int fsync_super(struct super_block *);
- extern int fsync_no_super(kdev_t);
- extern void sync_inodes_sb(struct super_block *);
-@@ -1234,6 +1235,8 @@
- extern int filemap_fdatasync(struct address_space *);
- extern int filemap_fdatawait(struct address_space *);
- extern void sync_supers(kdev_t);
-+extern void sync_supers_lockfs(kdev_t);
-+extern void unlockfs(kdev_t);
- extern int bmap(struct inode *, int);
- extern int notify_change(struct dentry *, struct iattr *);
- extern int permission(struct inode *, int);
-diff -Nru a/kernel/ksyms.c b/kernel/ksyms.c
---- a/kernel/ksyms.c   Wed May 22 10:43:49 2002
-+++ b/kernel/ksyms.c   Wed May 22 10:43:49 2002
-@@ -180,6 +180,8 @@
- EXPORT_SYMBOL(invalidate_inode_pages);
- EXPORT_SYMBOL(truncate_inode_pages);
- EXPORT_SYMBOL(fsync_dev);
-+EXPORT_SYMBOL(fsync_dev_lockfs);
-+EXPORT_SYMBOL(unlockfs);
- EXPORT_SYMBOL(fsync_no_super);
- EXPORT_SYMBOL(permission);
- EXPORT_SYMBOL(vfs_permission);
-
-
-_______________________________________________
-lvm-devel mailing list
-lvm-devel@sistina.com
-http://lists.sistina.com/mailman/listinfo/lvm-devel
-