summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsglob.h
diff options
context:
space:
mode:
authorRoland Dreier <roland@digitalvampire.org>2007-05-03 04:33:45 +0000
committerSteve French <sfrench@us.ibm.com>2007-05-03 04:33:45 +0000
commit796e5661f6b6be1600b3ab47c61ce61cf3e7a353 (patch)
treea7d4b6df0eef48d1b3a06b11b6705eb597a360b1 /fs/cifs/cifsglob.h
parent0b2365f826f40d6e966365299d4e9dcc7ef4e93f (diff)
downloadop-kernel-dev-796e5661f6b6be1600b3ab47c61ce61cf3e7a353.zip
op-kernel-dev-796e5661f6b6be1600b3ab47c61ce61cf3e7a353.tar.gz
[CIFS] Change semaphore to mutex for cifs lock_sem
Originally at http://lkml.org/lkml/2006/9/2/86 The recent change to "allow Windows blocking locks to be cancelled via a CANCEL_LOCK call" introduced a new semaphore in struct cifsFileInfo, lock_sem. However, semaphores used as mutexes are deprecated these days, and there's no reason to add a new one to the kernel. Therefore, convert lock_sem to a struct mutex (and also fix one indentation glitch on one of the lines changed anyway). Signed-off-by: Roland Dreier <roland@digitalvampire.org> Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r--fs/cifs/cifsglob.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index e4de8eb..23655de 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -311,7 +311,7 @@ struct cifsFileInfo {
/* lock scope id (0 if none) */
struct file * pfile; /* needed for writepage */
struct inode * pInode; /* needed for oplock break */
- struct semaphore lock_sem;
+ struct mutex lock_mutex;
struct list_head llist; /* list of byte range locks we have. */
unsigned closePend:1; /* file is marked to close */
unsigned invalidHandle:1; /* file closed via session abend */
OpenPOWER on IntegriCloud