Commit 46b51325 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v7.0-rc5-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fix from Steve French:

 - Fix rebuild of mapping table

* tag 'v7.0-rc5-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6:
  smb/client: ensure smb2_mapping_table rebuild on cmd changes
parents d813f421 34420cb9

fs/smb/client/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ cifs-$(CONFIG_CIFS_COMPRESSION) += compress.o compress/lz77.o 
# Build the SMB2 error mapping table from smb2status.h

#

$(obj)/smb2_mapping_table.c: $(src)/../common/smb2status.h \

			    $(src)/gen_smb2_mapping

	$(call cmd,gen_smb2_mapping)

			     $(src)/gen_smb2_mapping FORCE

	$(call if_changed,gen_smb2_mapping)



$(obj)/smb2maperror.o: $(obj)/smb2_mapping_table.c
@@ -58,4 +58,5 @@ quiet_cmd_gen_smb2_mapping = GEN $@ 


obj-$(CONFIG_SMB_KUNIT_TESTS) += smb2maperror_test.o



clean-files	+= smb2_mapping_table.c
 
# Let Kbuild handle tracking and cleaning

targets += smb2_mapping_table.c