From 3ee3a2b75c3aa6cde8eb0b2c0d615d64d45edf94 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 20 Jun 2008 09:12:01 -0600
Subject: [PATCH] --- yaml --- r: 100405 b: refs/heads/master c:
 a238b790d5f99c7832f9b73ac8847025815b85f7 h: refs/heads/master i:   100403:
 ff8553d6df1dfe4231d8c56a125a42d2fb389862 v: v3

---
 [refs]           | 2 +-
 trunk/fs/fcntl.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9169a82a9e8a..f9e0690d47f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2db9f0a35a4e4ad7cee756a4e0dabb7c1c8b6c72
+refs/heads/master: a238b790d5f99c7832f9b73ac8847025815b85f7
diff --git a/trunk/fs/fcntl.c b/trunk/fs/fcntl.c
index bfd776509a72..330a7d782591 100644
--- a/trunk/fs/fcntl.c
+++ b/trunk/fs/fcntl.c
@@ -12,7 +12,6 @@
 #include <linux/fdtable.h>
 #include <linux/capability.h>
 #include <linux/dnotify.h>
-#include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/security.h>
@@ -227,7 +226,6 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
 	if (error)
 		return error;
 
-	lock_kernel();
 	if ((arg ^ filp->f_flags) & FASYNC) {
 		if (filp->f_op && filp->f_op->fasync) {
 			error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
@@ -238,7 +236,6 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
 
 	filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK);
  out:
-	unlock_kernel();
 	return error;
 }