src/patches/suse-2.6.27.25/patches.suse/dlm-remove-bkl.patch

   1 From: David Teigland <teigland@redhat.com>
   2 commit f9f2ed486256f3480e4d499ffd6bf730bc5e6fc6
   3 Author: David Teigland <teigland@redhat.com>
   4 Date:   Thu Sep 4 12:51:20 2008 -0500
   5 Subject: dlm: remove bkl
   6
   7     BLK from recent pushdown is not needed.
   8
   9 Signed-off-by: David Teigland <teigland@redhat.com>
  10 Signed-off-by: Coly Li <coly.li@suse.de>
  11
  12 diff --git a/fs/dlm/user.c b/fs/dlm/user.c
  13 index 81627b5..b3832c6 100644
  14 --- a/fs/dlm/user.c
  15 +++ b/fs/dlm/user.c
  16 @@ -15,7 +15,6 @@
  17  #include <linux/poll.h>
  18  #include <linux/signal.h>
  19  #include <linux/spinlock.h>
  20 -#include <linux/smp_lock.h>
  21  #include <linux/dlm.h>
  22  #include <linux/dlm_device.h>
  23
  24 @@ -637,17 +636,13 @@ static int device_open(struct inode *inode, struct file *file)
  25         struct dlm_user_proc *proc;
  26         struct dlm_ls *ls;
  27
  28 -       lock_kernel();
  29         ls = dlm_find_lockspace_device(iminor(inode));
  30 -       if (!ls) {
  31 -               unlock_kernel();
  32 +       if (!ls)
  33                 return -ENOENT;
  34 -       }
  35
  36         proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL);
  37         if (!proc) {
  38                 dlm_put_lockspace(ls);
  39 -               unlock_kernel();
  40                 return -ENOMEM;
  41         }
  42
  43 @@ -659,7 +654,6 @@ static int device_open(struct inode *inode, struct file *file)
  44         spin_lock_init(&proc->locks_spin);
  45         init_waitqueue_head(&proc->wait);
  46         file->private_data = proc;
  47 -       unlock_kernel();
  48
  49         return 0;
  50  }
  51 @@ -914,7 +908,6 @@ int dlm_user_daemon_available(void)
  52
  53  static int ctl_device_open(struct inode *inode, struct file *file)
  54  {
  55 -       cycle_kernel_lock();
  56         file->private_data = NULL;
  57         return 0;
  58  }