Skip to content

Commit f2e5eac

Browse files
author
CKI KWF Bot
committed
Merge: netfs/fscache/cachefiles/CIFS/rxrpc/AFS: sync with upstream for RHEL 10.1
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1049 - sync netfs/fscache/cachefiles/CIFS/rxrpc/AFS with upstream for RHEL 10.1 JIRA: https://issues.redhat.com/browse/RHEL-96872 Omitted-fix: 561939e ("net: remove unused sock_enable_timestamps") Omitted-fix: ff8abbd ("smb: client: fix regression with native SMB symlinks") Omitted-fix: da8cf4b ("netfs: Fix hang due to missing case in final DIO read result collection") Omitted-fix: 9df7b5e ("netfs: Fix double put of request") Omitted-fix: 09623e3 ("netfs: Fix looping in wait functions") Omitted-fix: 3363da8 ("smb: client: fix native SMB symlink traversal") Omitted-fix: 3bbe467 ("smb: client: fix warning when reconnecting channel") Omitted-fix: e4d2878 ("rxrpc: Fix irq-disabled in local_bh_enable()") Omitted-fix: 4c238e3 ("netfs: Fix copy-to-cache so that it performs collection with ceph+fscache") Omitted-fix: 89635ea ("netfs: Fix race between cache write completion and ALL_QUEUED being set") Omitted-fix: 8767cb3 ("Fix SMB311 posix special file creation to servers which do not advertise reparse support") Omitted-fix: 83898e4 ("smb: invalidate and close cached directory when creating child entries") Signed-off-by: Paulo Alcantara <paalcant@redhat.com> Approved-by: David Howells <dhowells@redhat.com> Approved-by: Benjamin Coddington <bcodding@redhat.com> Approved-by: Marcelo Ricardo Leitner <mleitner@redhat.com> Approved-by: Marc Dionne <mdionne@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 6fd99d8 + 85a9c9b commit f2e5eac

File tree

163 files changed

+12105
-6231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+12105
-6231
lines changed

Documentation/admin-guide/cifs/usage.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ configured for Unix Extensions (and the client has not disabled
270270
illegal Windows/NTFS/SMB characters to a remap range (this mount parameter
271271
is the default for SMB3). This remap (``mapposix``) range is also
272272
compatible with Mac (and "Services for Mac" on some older Windows).
273+
When POSIX Extensions for SMB 3.1.1 are negotiated, remapping is automatically
274+
disabled.
273275

274276
CIFS VFS Mount Options
275277
======================

Documentation/core-api/folio_queue.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,16 @@ The marks can be set by::
151151

152152
void folioq_mark(struct folio_queue *folioq, unsigned int slot);
153153
void folioq_mark2(struct folio_queue *folioq, unsigned int slot);
154-
void folioq_mark3(struct folio_queue *folioq, unsigned int slot);
155154

156155
Cleared by::
157156

158157
void folioq_unmark(struct folio_queue *folioq, unsigned int slot);
159158
void folioq_unmark2(struct folio_queue *folioq, unsigned int slot);
160-
void folioq_unmark3(struct folio_queue *folioq, unsigned int slot);
161159

162160
And the marks can be queried by::
163161

164162
bool folioq_is_marked(const struct folio_queue *folioq, unsigned int slot);
165163
bool folioq_is_marked2(const struct folio_queue *folioq, unsigned int slot);
166-
bool folioq_is_marked3(const struct folio_queue *folioq, unsigned int slot);
167164

168165
The marks can be used for any purpose and are not interpreted by this API.
169166

0 commit comments

Comments
 (0)