linux.git/drivers/staging/zram, branch v3.3

Staging: zram: Add a missing GFP_KERNEL specifier in zram_init_device()

2011-12-08T22:59:48+00:00

The allocation of zram->compress_buffer is misssing a GFP_* specifier.
This is equivalent to GFP_NOWAIT but it is more likely a omission.
Since the allocation just above it uses GFP_KERNEL, there is no reason
to use GFP_NOWAIT here. Therefore, add GFP_KERNEL.

Signed-off-by: Jerome Marchand 
Signed-off-by: Greg Kroah-Hartman

Staging: zram/zram_sysfs.c: Fixed call of obsolete function strict_strtoX

2011-12-08T22:59:48+00:00

As reported by checkpatch.pl strict_strtoX is obsolet and should be
replaced by kstrtoX.

Signed-off-by: Sergey Datsevich 
Signed-off-by: Bjoern Meier 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block

2011-11-05T00:06:58+00:00

* 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits)
  block: don't call blk_drain_queue() if elevator is not up
  blk-throttle: use queue_is_locked() instead of lockdep_is_held()
  blk-throttle: Take blkcg->lock while traversing blkcg->policy_list
  blk-throttle: Free up policy node associated with deleted rule
  block: warn if tag is greater than real_max_depth.
  block: make gendisk hold a reference to its queue
  blk-flush: move the queue kick into
  blk-flush: fix invalid BUG_ON in blk_insert_flush
  block: Remove the control of complete cpu from bio.
  block: fix a typo in the blk-cgroup.h file
  block: initialize the bounce pool if high memory may be added later
  block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown
  block: drop @tsk from attempt_plug_merge() and explain sync rules
  block: make get_request[_wait]() fail if queue is dead
  block: reorganize throtl_get_tg() and blk_throtl_bio()
  block: reorganize queue draining
  block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()
  block: pass around REQ_* flags instead of broken down booleans during request alloc/free
  block: move blk_throtl prototypes to block/blk.h
  block: fix genhd refcounting in blkio_policy_parse_and_set()
  ...

Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion
and making the request functions be of type "void" instead of "int" in
 - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}
 - drivers/staging/zram/zram_drv.c

block: remove support for bio remapping from ->make_request

2011-09-12T10:12:01+00:00

There is very little benefit in allowing to let a ->make_request
instance update the bios device and sector and loop around it in
__generic_make_request when we can archive the same through calling
generic_make_request from the driver and letting the loop in
generic_make_request handle it.

Note that various drivers got the return value from ->make_request and
returned non-zero values for errors.

Signed-off-by: Christoph Hellwig 
Acked-by: NeilBrown 
Signed-off-by: Jens Axboe

zram: Fix sparse warnings

2011-09-09T23:09:50+00:00

Fixes sparse warning:
zram_drv.c:666:6: warning: symbol 'zram_slot_free_notify' was not
declared. Should it be static?

Also, max_zpage_size is now size_t just to be consistent with data-type
of other variables maintaining sizes of various kinds.

Signed-off-by: Nitin Gupta 
Signed-off-by: Greg Kroah-Hartman

staging: zram: prevent accessing an unallocated table when init fails early

2011-09-06T23:56:16+00:00

When the allocation of zram->table fails, we set zram->disksize to zero
to prevent accessing the unallocated table entries during cleanup.
However, we currently don't take this precaution when the initialization
fails earlier.

Signed-off-by: Jerome Marchand 
Signed-off-by: Greg Kroah-Hartman

staging: zram: fix zram locking

2011-09-06T23:56:15+00:00

Currently init_lock only prevents concurrent execution of zram_init_device()
and zram_reset_device() but not zram_make_request() nor sysfs store functions.

This patch changes init_lock into a rw_semaphore. A write lock is taken by
init, reset and store functions, a read lock is taken by zram_make_request().
Also, avoids to release the lock before calling __zram_reset_device() for
cleaning after a failed init, thus preventing any concurrent task to see an
inconsistent state of zram.

Signed-off-by: Jerome Marchand 
Signed-off-by: Greg Kroah-Hartman

staging: zram: make global var "num_devices" use unique name

2011-08-23T21:34:19+00:00

The global variable "num_devices" is too general to be
global. This patch switches the name to be "zram_num_devices".

Signed-off-by: Noah Watkins 
Signed-off-by: Greg Kroah-Hartman

staging: zram: make global var "devices" use unique name

2011-08-23T21:34:19+00:00

The global variable "devices" is too general to be global.
This patch switches the name to be "zram_devices".

Signed-off-by: Noah Watkins 
Signed-off-by: Greg Kroah-Hartman

Staging: zram: Fix kunmapping order

2011-07-18T20:22:52+00:00

This patch fixes the unmapping order of KM_USER0/1 in
handle_uncompressed_page() and zram_read() so that kmap()/kunmap() calls
are correctly nested.

Reported-by: Nitin Gupta 
Signed-off-by: Jerome Marchand 
Reviewed-by: Nitin Gupta 
Signed-off-by: Greg Kroah-Hartman