diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-04 19:11:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-04 19:11:16 +0200 |
| commit | 8d00647f2cf0780497274a4b0ab0e66509579459 (patch) | |
| tree | b6f5171769896b69aa603d870f2b870c10703db9 | |
| parent | [PATCH] net: Ignore sysfs network device rename bugs. (diff) | |
| parent | [S390] cio: Fix handling of interrupt for csch(). (diff) | |
| download | linux-8d00647f2cf0780497274a4b0ab0e66509579459.tar.xz linux-8d00647f2cf0780497274a4b0ab0e66509579459.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: Fix handling of interrupt for csch().
[S390] page_mkclean data corruption.
| -rw-r--r-- | drivers/s390/cio/device_status.c | 8 | ||||
| -rw-r--r-- | mm/rmap.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c index 25d99bd28089..aa96e6752592 100644 --- a/drivers/s390/cio/device_status.c +++ b/drivers/s390/cio/device_status.c @@ -221,6 +221,14 @@ ccw_device_accumulate_irb(struct ccw_device *cdev, struct irb *irb) cdev_irb = &cdev->private->irb; + /* + * If the clear function had been performed, all formerly pending + * status at the subchannel has been cleared and we must not pass + * intermediate accumulated status to the device driver. + */ + if (irb->scsw.fctl & SCSW_FCTL_CLEAR_FUNC) + memset(&cdev->private->irb, 0, sizeof(struct irb)); + /* Copy bits which are valid only for the start function. */ if (irb->scsw.fctl & SCSW_FCTL_START_FUNC) { /* Copy key. */ diff --git a/mm/rmap.c b/mm/rmap.c index 22ed3f71a674..b82146e6dfc9 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -498,9 +498,9 @@ int page_mkclean(struct page *page) struct address_space *mapping = page_mapping(page); if (mapping) ret = page_mkclean_file(mapping, page); + if (page_test_and_clear_dirty(page)) + ret = 1; } - if (page_test_and_clear_dirty(page)) - ret = 1; return ret; } |