LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Alex Dubov <oakad@yahoo.com>
Cc: linux-kernel@vger.kernel.org, Jens Axboe <jens.axboe@oracle.com>
Subject: Re: [PATCH] memstick: use __blk_end_request to complete requests
Date: Sun, 3 Feb 2008 23:07:05 -0800	[thread overview]
Message-ID: <20080203230705.581a3315.akpm@linux-foundation.org> (raw)
In-Reply-To: <943786.16504.qm@web36704.mail.mud.yahoo.com>

On Sun, 3 Feb 2008 20:31:10 -0800 (PST) Alex Dubov <oakad@yahoo.com> wrote:

> Signed-off-by: Alex Dubov <oakad@yahoo.com>
> 
> --- mspro_block.c.orig	2008-02-04 15:25:16.000000000 +1100
> +++ mspro_block.c	2008-02-04 15:26:28.226886699 +1100
> @@ -668,20 +668,13 @@
> 
>  		spin_lock_irqsave(&msb->q_lock, flags);
>  		if (rc >= 0)
> -			chunk = end_that_request_chunk(req, 1, rc);
> +			chunk = __blk_end_request(req, 0, rc);
>  		else
> -			chunk = end_that_request_first(req, rc,
> -						       req->current_nr_sectors);
> +			chunk = __blk_end_request(req, rc, 0);
> 
>  		dev_dbg(&card->dev, "end chunk %d, %d\n", rc, chunk);
> -		if (!chunk) {
> -			add_disk_randomness(req->rq_disk);
> -			blkdev_dequeue_request(req);
> -			end_that_request_last(req, rc > 0 ? 1 : rc);
> -		}
>  		spin_unlock_irqrestore(&msb->q_lock, flags);
>  	} while (chunk);
> -
>  }
> 
>  static int mspro_block_has_request(struct mspro_block_data *msb)
> 

Thanks.  However please do prepare patches in `patch -p1' form.

Could you please fix the build error in the code in 2.6.24-mm1?

I part-fixed it (then disabled it) with this:

--- a/drivers/memstick/core/mspro_block.c~a
+++ a/drivers/memstick/core/mspro_block.c
@@ -1233,11 +1232,12 @@ static int mspro_block_resume(struct mem
 	unsigned long flags;
 	int rc = 0;
 
-#ifdef CONFIG_MEMSTICK_UNSAFE_RESUME
+#if defined(CONFIG_MEMSTICK_UNSAFE_RESUME) && 0
 
 	struct mspro_block_data *new_msb;
 	struct memstick_host *host = card->host;
-	struct mspro_sys_attr s_attr, r_attr;
+	struct mspro_sys_attr *s_attr;
+	struct mspro_sys_attr *r_attr;
 	unsigned char cnt;
 
 	mutex_lock(&host->lock);
_

see, this:

		s_attr = container_of(new_msb->attr_group.attrs[cnt],
				      struct mspro_sys_attr,
				      dev_attr);

is broken.  Attribute groups hold `struct attribute' but this code thinks
they hold `struct device_attribute'.  I could bodge it to compile cleanly,
but I don't know if it will work.



  reply	other threads:[~2008-02-04  7:07 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-02  6:42 [PATCH] [MEMSTICK] Initial commit for Sony MemoryStick support oakad
2008-01-10  9:00 ` Andrew Morton
2008-01-11 12:14   ` Jens Axboe
2008-01-14  3:26   ` Alex Dubov
2008-01-22 16:12   ` Alex Dubov
2008-01-22 18:59     ` Andrew Morton
2008-01-25  7:58       ` [PATCH] [MEMSTICK] Updates for the memstick driver Alex Dubov
2008-01-27  6:01         ` Andrew Morton
2008-02-03  0:16         ` Andrew Morton
2008-02-04  4:31           ` [PATCH] memstick: use __blk_end_request to complete requests Alex Dubov
2008-02-04  7:07             ` Andrew Morton [this message]
2008-02-09 14:59               ` [PATCH] memstick: fix attribute structure casting in mspro_block_resume Alex Dubov
2008-01-15 17:21 ` [PATCH] [MEMSTICK] Initial commit for Sony MemoryStick support Mariusz Kozlowski
2008-01-16  1:52   ` Alex Dubov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080203230705.581a3315.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=jens.axboe@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oakad@yahoo.com \
    --subject='Re: [PATCH] memstick: use __blk_end_request to complete requests' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).