Commit 73cf8085 authored by Steve French's avatar Steve French
Browse files

cifs: simplify code by removing CONFIG_CIFS_ACL ifdef 



SMB3 ACL support is needed for many use cases now and should not be
ifdeffed out, even for SMB1 (CIFS).  Remove the CONFIG_CIFS_ACL
ifdef so ACL support is always built into cifs.ko

Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 6552d6a0

fs/cifs/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -145,14 +145,6 @@ config CIFS_POSIX 
	  (such as Samba 3.10 and later) which can negotiate

	  CIFS POSIX ACL support.  If unsure, say N.



config CIFS_ACL

	bool "Provide CIFS ACL support"

	depends on CIFS_XATTR && KEYS

	help

	  Allows fetching CIFS/NTFS ACL from the server.  The DACL blob

	  is handed over to the application/caller.  See the man

	  page for getcifsacl for more information.  If unsure, say Y.



config CIFS_DEBUG

	bool "Enable CIFS debugging routines"

	default y

fs/cifs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -10,10 +10,9 @@ cifs-y := trace.o cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o \ 
	  cifs_unicode.o nterr.o cifsencrypt.o \

	  readdir.o ioctl.o sess.o export.o smb1ops.o winucase.o \

	  smb2ops.o smb2maperror.o smb2transport.o \

	  smb2misc.o smb2pdu.o smb2inode.o smb2file.o

	  smb2misc.o smb2pdu.o smb2inode.o smb2file.o cifsacl.o



cifs-$(CONFIG_CIFS_XATTR) += xattr.o

cifs-$(CONFIG_CIFS_ACL) += cifsacl.o



cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o

fs/cifs/cifs_debug.c

+0 −2
Original line number Diff line number Diff line
@@ -240,9 +240,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
#ifdef CONFIG_CIFS_XATTR

	seq_printf(m, ",XATTR");

#endif

#ifdef CONFIG_CIFS_ACL

	seq_printf(m, ",ACL");

#endif

	seq_putc(m, '\n');

	seq_printf(m, "CIFSMaxBufSize: %d\n", CIFSMaxBufSize);

	seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);

fs/cifs/cifsfs.c

+0 −6
Original line number Diff line number Diff line
@@ -1518,11 +1518,9 @@ init_cifs(void) 
		goto out_destroy_dfs_cache;

#endif /* CONFIG_CIFS_UPCALL */



#ifdef CONFIG_CIFS_ACL

	rc = init_cifs_idmap();

	if (rc)

		goto out_register_key_type;

#endif /* CONFIG_CIFS_ACL */



	rc = register_filesystem(&cifs_fs_type);

	if (rc)
@@ -1537,10 +1535,8 @@ init_cifs(void) 
	return 0;



out_init_cifs_idmap:

#ifdef CONFIG_CIFS_ACL

	exit_cifs_idmap();

out_register_key_type:

#endif

#ifdef CONFIG_CIFS_UPCALL

	exit_cifs_spnego();

out_destroy_dfs_cache:
@@ -1572,9 +1568,7 @@ exit_cifs(void) 
	unregister_filesystem(&cifs_fs_type);

	unregister_filesystem(&smb3_fs_type);

	cifs_dfs_release_automount_timer();

#ifdef CONFIG_CIFS_ACL

	exit_cifs_idmap();

#endif

#ifdef CONFIG_CIFS_UPCALL

	exit_cifs_spnego();

#endif

fs/cifs/cifsglob.h

+0 −2
Original line number Diff line number Diff line
@@ -1871,7 +1871,6 @@ extern unsigned int cifs_min_small; /* min size of small buf pool */ 
extern unsigned int cifs_max_pending; /* MAX requests at once to server*/

extern bool disable_legacy_dialects;  /* forbid vers=1.0 and vers=2.0 mounts */



#ifdef CONFIG_CIFS_ACL

GLOBAL_EXTERN struct rb_root uidtree;

GLOBAL_EXTERN struct rb_root gidtree;

GLOBAL_EXTERN spinlock_t siduidlock;
@@ -1880,7 +1879,6 @@ GLOBAL_EXTERN struct rb_root siduidtree; 
GLOBAL_EXTERN struct rb_root sidgidtree;

GLOBAL_EXTERN spinlock_t uidsidlock;

GLOBAL_EXTERN spinlock_t gidsidlock;

#endif /* CONFIG_CIFS_ACL */



void cifs_oplock_break(struct work_struct *work);

void cifs_queue_oplock_break(struct cifsFileInfo *cfile);

CRA Git | Maintained and supported by SUSTech CRA and CCSE