diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-08-16 19:43:16 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-08-16 19:43:16 -0300 |
| commit | 3bce87eb744f1f88523a118e10e0deebf31806ec (patch) | |
| tree | 02f9090ff510c97ce442a07b807615ad00f1406b /fs/smb/server/smb_common.h | |
| parent | 2615639352420e6e3115952c5b8f46846e1c6d0e (diff) | |
| parent | 85652baa895b59b94bea29c77cb9b51cf7120deb (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up the latest perf-tools merge for 6.11, i.e. to have the
current perf tools branch that is getting into 6.11 with the
perf-tools-next that is geared towards 6.12.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'fs/smb/server/smb_common.h')
| -rw-r--r-- | fs/smb/server/smb_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h index f1092519c0c2..4a3148b0167f 100644 --- a/fs/smb/server/smb_common.h +++ b/fs/smb/server/smb_common.h @@ -447,6 +447,8 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, int ksmbd_smb_negotiate_common(struct ksmbd_work *work, unsigned int command); int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp); +int __ksmbd_override_fsids(struct ksmbd_work *work, + struct ksmbd_share_config *share); int ksmbd_override_fsids(struct ksmbd_work *work); void ksmbd_revert_fsids(struct ksmbd_work *work); |