Commit 138ec873 authored by Konstantin Baev's avatar Konstantin Baev

Fix compile problem in kernel 2.6.29 (RT#9966)

parent dc96ed70
...@@ -259,7 +259,7 @@ extern int CIFSSMBUnixQuerySymLink(const int xid, ...@@ -259,7 +259,7 @@ extern int CIFSSMBUnixQuerySymLink(const int xid,
const struct nls_table *nls_codepage); const struct nls_table *nls_codepage);
extern int CIFSSMBQueryReparseLinkInfo(const int xid, extern int CIFSSMBQueryReparseLinkInfo(const int xid,
struct cifsTconInfo *tcon, struct cifsTconInfo *tcon,
const unsignedc har *searchName, const unsigned char *searchName,
char *symlinkinfo, const int buflen, __u16 fid, char *symlinkinfo, const int buflen, __u16 fid,
const struct nls_table *nls_codepage); const struct nls_table *nls_codepage);
......
...@@ -732,12 +732,12 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) ...@@ -732,12 +732,12 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
if (lockType & LOCKING_ANDX_SHARED_LOCK) { if (lockType & LOCKING_ANDX_SHARED_LOCK) {
pfLock->fl_type = F_WRLCK; pfLock->fl_type = F_WRLCK;
} else { } else {
rc = CIFSSMBLock(xid, pTcon, netfid, length, rc = CIFSSMBLock(xid, tcon, netfid, length,
pfLock->fl_start, 0, 1, pfLock->fl_start, 0, 1,
lockType | LOCKING_ANDX_SHARED_LOCK, lockType | LOCKING_ANDX_SHARED_LOCK,
0 /* wait flag */ ); 0 /* wait flag */ );
if (rc == 0) { if (rc == 0) {
rc = CIFSSMBLock(xid, pTcon, netfid, rc = CIFSSMBLock(xid, tcon, netfid,
length, pfLock->fl_start, 1, 0, length, pfLock->fl_start, 1, 0,
lockType | lockType |
LOCKING_ANDX_SHARED_LOCK, LOCKING_ANDX_SHARED_LOCK,
...@@ -798,7 +798,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) ...@@ -798,7 +798,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
} else if (numUnlock) { } else if (numUnlock) {
/* For each stored lock that this unlock overlaps /* For each stored lock that this unlock overlaps
completely, unlock it. */ completely, unlock it. */
rc = cifs_lock_storage_del_lock(xid, pTcon, fid->pid, rc = cifs_lock_storage_del_lock(xid, tcon, fid->pid,
fid->pInode->i_ino, fid->pInode->i_ino,
pfLock->fl_start, pfLock->fl_start,
length, lockType); length, lockType);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment