Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d61eda8 authored by Colin Ian King's avatar Colin Ian King Committed by Steve French
Browse files

CIFS: make arrays static const, reduces object code size 



Don't populate the read-only arrays types[] on the stack, instead make
them both static const.  Makes the object code smaller by over 200 bytes:

Before:
   text	   data	    bss	    dec	    hex	filename
 111503	  37696	    448	 149647	  2488f	fs/cifs/file.o

After:
   text	   data	    bss	    dec	    hex	filename
 111140	  37856	    448	 149444	  247c4	fs/cifs/file.o

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
parent 1fa089ec

fs/cifs/file.c

+8 −4
Original line number Diff line number Diff line
@@ -1102,8 +1102,10 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile) 
	struct cifs_tcon *tcon;

	unsigned int num, max_num, max_buf;

	LOCKING_ANDX_RANGE *buf, *cur;

	int types[] = {LOCKING_ANDX_LARGE_FILES,

		       LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES};

	static const int types[] = {

		LOCKING_ANDX_LARGE_FILES,

		LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES

	};

	int i;



	xid = get_xid();
@@ -1434,8 +1436,10 @@ cifs_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock, 
		  unsigned int xid)

{

	int rc = 0, stored_rc;

	int types[] = {LOCKING_ANDX_LARGE_FILES,

		       LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES};

	static const int types[] = {

		LOCKING_ANDX_LARGE_FILES,

		LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES

	};

	unsigned int i;

	unsigned int max_num, num, max_buf;

	LOCKING_ANDX_RANGE *buf, *cur;