forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Do not send Query All EAs SMB when mount option nouser_xattr [CIFS] endian errors in lanman protocol support [CIFS] Fix oops in cifs_close due to unitialized lock sem and list in [CIFS] Fix oops when negotiating lanman and no password specified [CIFS] [CIFS] Allow cifsd to suspend if connection is lost [CIFS] Make midState usage more consistent [CIFS] spinlock protect read of last srv response time in timeout path [CIFS] Do not time out posix brl requests when using new posix setfileinfo
- Loading branch information
Showing
17 changed files
with
576 additions
and
260 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
* | ||
* Copyright (C) International Business Machines Corp., 2002,2006 | ||
* Author(s): Steve French ([email protected]) | ||
* Jeremy Allison ([email protected]) | ||
* | ||
* This library is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU Lesser General Public License as published | ||
|
@@ -158,7 +159,8 @@ struct TCP_Server_Info { | |
/* 16th byte of RFC1001 workstation name is always null */ | ||
char workstation_RFC1001_name[SERVER_NAME_LEN_WITH_NULL]; | ||
__u32 sequence_number; /* needed for CIFS PDU signature */ | ||
char mac_signing_key[CIFS_SESS_KEY_SIZE + 16]; | ||
char mac_signing_key[CIFS_SESS_KEY_SIZE + 16]; | ||
unsigned long lstrp; /* when we got last response from this server */ | ||
}; | ||
|
||
/* | ||
|
@@ -266,14 +268,14 @@ struct cifsTconInfo { | |
}; | ||
|
||
/* | ||
* This info hangs off the cifsFileInfo structure. This is used to track | ||
* byte stream locks on the file | ||
* This info hangs off the cifsFileInfo structure, pointed to by llist. | ||
* This is used to track byte stream locks on the file | ||
*/ | ||
struct cifsLockInfo { | ||
struct cifsLockInfo *next; | ||
int start; | ||
int length; | ||
int type; | ||
struct list_head llist; /* pointer to next cifsLockInfo */ | ||
__u64 offset; | ||
__u64 length; | ||
__u8 type; | ||
}; | ||
|
||
/* | ||
|
@@ -304,6 +306,8 @@ 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 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 */ | ||
atomic_t wrtPending; /* handle in use - defer close */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.