git.codelabs.ch
/
muen
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6
[muen/linux.git]
/
fs
/
cifs
/
cifssmb.c
diff --git
a/fs/cifs/cifssmb.c
b/fs/cifs/cifssmb.c
index 7cbe283159713cb5a2d95390c3407cb02ebdcdc2..35dc5bf01ee2ab96f62a793c466e033bf0659de4 100644
(file)
--- a/
fs/cifs/cifssmb.c
+++ b/
fs/cifs/cifssmb.c
@@
-2534,7
+2534,7
@@
CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon,
pLockData->fl_start = le64_to_cpu(parm_data->start);
pLockData->fl_end = pLockData->fl_start +
le64_to_cpu(parm_data->length) - 1;
- pLockData->fl_pid = le32_to_cpu(parm_data->pid);
+ pLockData->fl_pid =
-
le32_to_cpu(parm_data->pid);
}
}