From 5070bb18daa9c24afac7205d2ee6fbe0f012bd1b Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 27 Apr 2010 16:24:24 +0200
Subject: [PATCH] --- yaml --- r: 198161 b: refs/heads/master c:
 977183902a52d1e0adc986f9462424db5a545044 h: refs/heads/master i:   198159:
 c02adee39ab22a101d20eaf40e8203d6ba186901 v: v3

---
 [refs]                | 2 +-
 trunk/fs/coda/psdev.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3ea09728dcf7..a1ffa5d59388 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5f1d54cbc1b2f320ac054b2df519dec22a27779
+refs/heads/master: 977183902a52d1e0adc986f9462424db5a545044
diff --git a/trunk/fs/coda/psdev.c b/trunk/fs/coda/psdev.c
index be4392ca2098..66b9cf79c5ba 100644
--- a/trunk/fs/coda/psdev.c
+++ b/trunk/fs/coda/psdev.c
@@ -73,8 +73,7 @@ static unsigned int coda_psdev_poll(struct file *file, poll_table * wait)
 	return mask;
 }
 
-static int coda_psdev_ioctl(struct inode * inode, struct file * filp, 
-			    unsigned int cmd, unsigned long arg)
+static long coda_psdev_ioctl(struct file * filp, unsigned int cmd, unsigned long arg)
 {
 	unsigned int data;
 
@@ -344,7 +343,7 @@ static const struct file_operations coda_psdev_fops = {
 	.read		= coda_psdev_read,
 	.write		= coda_psdev_write,
 	.poll		= coda_psdev_poll,
-	.ioctl		= coda_psdev_ioctl,
+	.unlocked_ioctl	= coda_psdev_ioctl,
 	.open		= coda_psdev_open,
 	.release	= coda_psdev_release,
 };