git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[sfrench/cifs-2.6.git]
/
fs
/
dlm
/
netlink.c
diff --git
a/fs/dlm/netlink.c
b/fs/dlm/netlink.c
index aa2a5775a0274f88ebc8eda63d3e4fbe49eeaeb4..ccc9d62c462d940c156c42c6c99518261edb4603 100644
(file)
--- a/
fs/dlm/netlink.c
+++ b/
fs/dlm/netlink.c
@@
-115,7
+115,6
@@
static void fill_data(struct dlm_lock_data *data, struct dlm_lkb *lkb)
data->status = lkb->lkb_status;
data->grmode = lkb->lkb_grmode;
data->rqmode = lkb->lkb_rqmode;
- data->timestamp = lkb->lkb_timestamp;
if (lkb->lkb_ua)
data->xid = lkb->lkb_ua->xid;
if (r) {