diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:38:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:38:54 +0200 |
| commit | 07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881 (patch) | |
| tree | ffd8a0ffd6d803e5fa78c115a83b7dcd3c246d7c /fs/cifs/cifsglob.h | |
| parent | 3c8fad9183ab7b3b3471fd2bb3d604104dd447cb (diff) | |
| parent | fa3a9f5744a92c0d7856d4e326c8d920d1d31116 (diff) | |
| download | linux-07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881.tar.bz2 | |
Merge branch 'linus' into x86/apic, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index bba106cdc43c..8f1d8c1e72be 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1619,6 +1619,7 @@ void cifs_oplock_break(struct work_struct *work); extern const struct slow_work_ops cifs_oplock_break_ops; extern struct workqueue_struct *cifsiod_wq; +extern __u32 cifs_lock_secret; extern mempool_t *cifs_mid_poolp; |