Commit 05680d86 authored by Peter Osterlund's avatar Peter Osterlund Committed by Linus Torvalds
Browse files

pktcdvd: reduce stack consumption 



On my system, pkt_open() consumes 584 bytes because the compiler decides to
inline lots of functions that would not normally be part of long call chains.
The following patch fixes that problem on my system.

Signed-off-by: default avatarPeter Osterlund <petero2@telia.com>
Cc: Nix <nix@esperi.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 735c4fb9

drivers/block/pktcdvd.c

+13 −8
Original line number Diff line number Diff line
@@ -849,7 +849,8 @@ static int pkt_flush_cache(struct pktcdvd_device *pd) 
/*

 * speed is given as the normal factor, e.g. 4 for 4x

 */

static int pkt_set_speed(struct pktcdvd_device *pd, unsigned write_speed, unsigned read_speed)

static noinline_for_stack int pkt_set_speed(struct pktcdvd_device *pd,

				unsigned write_speed, unsigned read_speed)

{

	struct packet_command cgc;

	struct request_sense sense;
@@ -1776,7 +1777,8 @@ static int pkt_get_track_info(struct pktcdvd_device *pd, __u16 track, __u8 type, 
	return pkt_generic_packet(pd, &cgc);

}



static int pkt_get_last_written(struct pktcdvd_device *pd, long *last_written)

static noinline_for_stack int pkt_get_last_written(struct pktcdvd_device *pd,

						long *last_written)

{

	disc_information di;

	track_information ti;
@@ -1813,7 +1815,7 @@ static int pkt_get_last_written(struct pktcdvd_device *pd, long *last_written) 
/*

 * write mode select package based on pd->settings

 */

static int pkt_set_write_settings(struct pktcdvd_device *pd)

static noinline_for_stack int pkt_set_write_settings(struct pktcdvd_device *pd)

{

	struct packet_command cgc;

	struct request_sense sense;
@@ -1972,7 +1974,7 @@ static int pkt_writable_disc(struct pktcdvd_device *pd, disc_information *di) 
	return 1;

}



static int pkt_probe_settings(struct pktcdvd_device *pd)

static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)

{

	struct packet_command cgc;

	unsigned char buf[12];
@@ -2071,7 +2073,8 @@ static int pkt_probe_settings(struct pktcdvd_device *pd) 
/*

 * enable/disable write caching on drive

 */

static int pkt_write_caching(struct pktcdvd_device *pd, int set)

static noinline_for_stack int pkt_write_caching(struct pktcdvd_device *pd,

						int set)

{

	struct packet_command cgc;

	struct request_sense sense;
@@ -2116,7 +2119,8 @@ static int pkt_lock_door(struct pktcdvd_device *pd, int lockflag) 
/*

 * Returns drive maximum write speed

 */

static int pkt_get_max_speed(struct pktcdvd_device *pd, unsigned *write_speed)

static noinline_for_stack int pkt_get_max_speed(struct pktcdvd_device *pd,

						unsigned *write_speed)

{

	struct packet_command cgc;

	struct request_sense sense;
@@ -2177,7 +2181,8 @@ static char us_clv_to_speed[16] = { 
/*

 * reads the maximum media speed from ATIP

 */

static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed)

static noinline_for_stack int pkt_media_speed(struct pktcdvd_device *pd,

						unsigned *speed)

{

	struct packet_command cgc;

	struct request_sense sense;
@@ -2249,7 +2254,7 @@ static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed) 
	}

}



static int pkt_perform_opc(struct pktcdvd_device *pd)

static noinline_for_stack int pkt_perform_opc(struct pktcdvd_device *pd)

{

	struct packet_command cgc;

	struct request_sense sense;

CRA Git | Maintained and supported by SUSTech CRA and CCSE