Skip to content

Commit

Permalink
agp: convert drivers/char/agp/frontend.c to use unlocked_ioctl
Browse files Browse the repository at this point in the history
As of now, agp_compat_ioctl already runs without the BKL.  Mutual exclusion
is enforced by agp_fe.agp_mutex in agp_ioctl() and agp_compat_ioctl().
Apply the same locking rationale to the two functions allowing BKL cleanup.

Signed-off-by: Mathieu Segaud <mathieu.segaud@regala.cx>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
  • Loading branch information
Mathieu Segaud authored and Dave Airlie committed Apr 26, 2008
1 parent 4ab92bc commit 09aa356
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/char/agp/frontend.c
Original file line number Diff line number Diff line change
@@ -967,7 +967,7 @@ int agpioc_chipset_flush_wrap(struct agp_file_private *priv)
return 0;
}

static int agp_ioctl(struct inode *inode, struct file *file,
static long agp_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
struct agp_file_private *curr_priv = file->private_data;
@@ -1058,7 +1058,7 @@ static const struct file_operations agp_fops =
.llseek = no_llseek,
.read = agp_read,
.write = agp_write,
.ioctl = agp_ioctl,
.unlocked_ioctl = agp_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = compat_agp_ioctl,
#endif

0 comments on commit 09aa356

Please sign in to comment.