Skip to content

Commit 57b8539

Browse files
author
Herton R. Krzesinski
committed
Merge: cifs: backport directory caching from upstream
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1935 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2151418 Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> Approved-by: Jeffrey Layton <jlayton@redhat.com> Approved-by: Benjamin Coddington <bcodding@redhat.com> Approved-by: Scott Mayhew <smayhew@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents e35703d + 67c6a35 commit 57b8539

31 files changed

+2261
-1270
lines changed

fs/cifs/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
ccflags-y += -I$(src) # needed for trace events
66
obj-$(CONFIG_CIFS) += cifs.o
77

8-
cifs-y := trace.o cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o \
8+
cifs-y := trace.o cifsfs.o cifs_debug.o connect.o dir.o file.o \
99
inode.o link.o misc.o netmisc.o smbencrypt.o transport.o \
10-
cifs_unicode.o nterr.o cifsencrypt.o \
10+
cached_dir.o cifs_unicode.o nterr.o cifsencrypt.o \
1111
readdir.o ioctl.o sess.o export.o unc.o winucase.o \
1212
smb2ops.o smb2maperror.o smb2transport.o \
1313
smb2misc.o smb2pdu.o smb2inode.o smb2file.o cifsacl.o fs_context.o \
@@ -31,4 +31,4 @@ cifs-$(CONFIG_CIFS_SMB_DIRECT) += smbdirect.o
3131

3232
cifs-$(CONFIG_CIFS_ROOT) += cifsroot.o
3333

34-
cifs-$(CONFIG_CIFS_ALLOW_INSECURE_LEGACY) += smb1ops.o
34+
cifs-$(CONFIG_CIFS_ALLOW_INSECURE_LEGACY) += smb1ops.o cifssmb.o

0 commit comments

Comments
 (0)