diff options
| author | Jakub Kicinski <[email protected]> | 2023-07-27 22:21:46 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-07-27 22:22:46 +0000 |
| commit | 014acf26685cfcfae37c9e98b83c622c0b01cf19 (patch) | |
| tree | 85ce0217698aef25875fdc62f2332bbbbc1bff2c /fs/smb/server/smb_common.h | |
| parent | Merge branch 'virtio-vsock-some-updates-for-msg_peek-flag' (diff) | |
| parent | Merge tag 'net-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-014acf26685cfcfae37c9e98b83c622c0b01cf19.tar.gz kernel-014acf26685cfcfae37c9e98b83c622c0b01cf19.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'fs/smb/server/smb_common.h')
| -rw-r--r-- | fs/smb/server/smb_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h index aeca0f46068f..f1092519c0c2 100644 --- a/fs/smb/server/smb_common.h +++ b/fs/smb/server/smb_common.h @@ -427,7 +427,7 @@ bool ksmbd_smb_request(struct ksmbd_conn *conn); int ksmbd_lookup_dialect_by_id(__le16 *cli_dialects, __le16 dialects_count); -void ksmbd_init_smb_server(struct ksmbd_work *work); +int ksmbd_init_smb_server(struct ksmbd_work *work); struct ksmbd_kstat; int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, |