public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-kernel@vger.kernel.org, akpm@osdl.org
Subject: Re: [PATCH] snapshot: Push BKL down into ioctl handlers
Date: Fri, 23 May 2008 03:09:52 +0200	[thread overview]
Message-ID: <200805230309.53136.rjw@sisk.pl> (raw)
In-Reply-To: <20080522222500.0f5873ff@core>

On Thursday, 22 of May 2008, Alan Cox wrote:
> Signed-off-by: Alan Cox <alan@redhat.com>
> 
> diff --git a/kernel/power/user.c b/kernel/power/user.c
> index f5512cb..658262b 100644
> --- a/kernel/power/user.c
> +++ b/kernel/power/user.c
> @@ -23,6 +23,7 @@
>  #include <linux/console.h>
>  #include <linux/cpu.h>
>  #include <linux/freezer.h>
> +#include <linux/smp_lock.h>
>  
>  #include <asm/uaccess.h>
>  
> @@ -164,8 +165,8 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf,
>  	return res;
>  }
>  
> -static int snapshot_ioctl(struct inode *inode, struct file *filp,
> -                          unsigned int cmd, unsigned long arg)
> +static long snapshot_ioctl(struct file *filp, unsigned int cmd,
> +							unsigned long arg)
>  {
>  	int error = 0;
>  	struct snapshot_data *data;
> @@ -181,6 +182,8 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
>  
>  	data = filp->private_data;
>  
> +	lock_kernel();
> +

Hm, well, I admit I'm a bit ignorant as far as the chardev locking is
concerned, but can you please tell me why would that be wrong if we didn't call
lock_kernel() here at all?

>  	switch (cmd) {
>  
>  	case SNAPSHOT_FREEZE:
> @@ -389,7 +392,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
>  		error = -ENOTTY;
>  
>  	}
> -
> +	unlock_kernel();
>  	return error;
>  }
>  
> @@ -399,7 +402,7 @@ static const struct file_operations snapshot_fops = {
>  	.read = snapshot_read,
>  	.write = snapshot_write,
>  	.llseek = no_llseek,
> -	.ioctl = snapshot_ioctl,
> +	.unlocked_ioctl = snapshot_ioctl,
>  };
>  
>  static struct miscdevice snapshot_device = {

Thanks,
Rafael

  reply	other threads:[~2008-05-23  1:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-22 21:25 [PATCH] snapshot: Push BKL down into ioctl handlers Alan Cox
2008-05-23  1:09 ` Rafael J. Wysocki [this message]
2008-05-23 11:04   ` Alan Cox
2008-05-23 11:22     ` Rafael J. Wysocki
2008-06-02 21:33       ` [RFC][PATCH] snapshot: Use pm_mutex for mutual exclusion Rafael J. Wysocki
2008-06-03 22:20         ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200805230309.53136.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox