{"id":956,"url":"http://patchwork.ozlabs.org/api/1.0/patches/956/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222151.m8MLp3tb031906@imap1.linux-foundation.org>","date":"2008-09-22T21:51:03","name":"[4/4] mISDN: misc timerdev fixes","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"d5aec2076bfc62a52d457fd36f056b4d451f102e","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222151.m8MLp3tb031906@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/956/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 1C36FDDF26\n\tfor ;\n\tTue, 23 Sep 2008 07:51:53 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753509AbYIVVvq (ORCPT );\n\tMon, 22 Sep 2008 17:51:46 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1753518AbYIVVvp\n\t(ORCPT ); Mon, 22 Sep 2008 17:51:45 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:44110 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753504AbYIVVvm (ORCPT\n\t); Mon, 22 Sep 2008 17:51:42 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLp4vx018204\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:51:05 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLp3tb031906; Mon, 22 Sep 2008 14:51:03 -0700"],"Message-Id":"<200809222151.m8MLp3tb031906@imap1.linux-foundation.org>","Subject":"[patch 4/4] mISDN: misc timerdev fixes","To":"kkeil@suse.de","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org,\n\tandi@firstfloor.org, ak@linux.intel.com","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:51:03 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Andi Kleen \n\n- Remove noop VFS stubs. The VFS does that on a NULL pointer anyways.\n- Fix timer handler prototype to be correct\n- Comment ugly SMP race I didn't fix.\n\nSigned-off-by: Andi Kleen \nCc: Karsten Keil \nSigned-off-by: Andrew Morton \n---\n\n drivers/isdn/mISDN/timerdev.c | 22 ++++++----------------\n 1 file changed, 6 insertions(+), 16 deletions(-)","diff":"diff -puN drivers/isdn/mISDN/timerdev.c~misdn-misc-timerdev-fixes drivers/isdn/mISDN/timerdev.c\n--- a/drivers/isdn/mISDN/timerdev.c~misdn-misc-timerdev-fixes\n+++ a/drivers/isdn/mISDN/timerdev.c\n@@ -124,18 +124,6 @@ mISDN_read(struct file *filep, char *buf\n \treturn ret;\n }\n \n-static loff_t\n-mISDN_llseek(struct file *filep, loff_t offset, int orig)\n-{\n-\treturn -ESPIPE;\n-}\n-\n-static ssize_t\n-mISDN_write(struct file *filep, const char *buf, size_t count, loff_t *off)\n-{\n-\treturn -EOPNOTSUPP;\n-}\n-\n static unsigned int\n mISDN_poll(struct file *filep, poll_table *wait)\n {\n@@ -157,8 +145,9 @@ mISDN_poll(struct file *filep, poll_tabl\n }\n \n static void\n-dev_expire_timer(struct mISDNtimer *timer)\n+dev_expire_timer(unsigned long data)\n {\n+\tstruct mISDNtimer *timer = (void *)data;\n \tu_long\t\t\tflags;\n \n \tspin_lock_irqsave(&timer->dev->lock, flags);\n@@ -191,7 +180,7 @@ misdn_add_timer(struct mISDNtimerdev *de\n \t\tspin_unlock_irqrestore(&dev->lock, flags);\n \t\ttimer->dev = dev;\n \t\ttimer->tl.data = (long)timer;\n-\t\ttimer->tl.function = (void *) dev_expire_timer;\n+\t\ttimer->tl.function = dev_expire_timer;\n \t\tinit_timer(&timer->tl);\n \t\ttimer->tl.expires = jiffies + ((HZ * (u_long)timeout) / 1000);\n \t\tadd_timer(&timer->tl);\n@@ -211,6 +200,9 @@ misdn_del_timer(struct mISDNtimerdev *de\n \tlist_for_each_entry(timer, &dev->pending, list) {\n \t\tif (timer->id == id) {\n \t\t\tlist_del_init(&timer->list);\n+\t\t\t/* RED-PEN AK: race -- timer can be still running on\n+\t\t\t * other CPU. Needs reference count I think\n+ \t\t \t */\n \t\t\tdel_timer(&timer->tl);\n \t\t\tret = timer->id;\n \t\t\tkfree(timer);\n@@ -268,9 +260,7 @@ mISDN_ioctl(struct inode *inode, struct \n }\n \n static struct file_operations mISDN_fops = {\n-\t.llseek\t\t= mISDN_llseek,\n \t.read\t\t= mISDN_read,\n-\t.write\t\t= mISDN_write,\n \t.poll\t\t= mISDN_poll,\n \t.ioctl\t\t= mISDN_ioctl,\n \t.open\t\t= mISDN_open,\n","prefixes":["4/4"]}