diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-09-07 20:27:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-07 20:27:20 +1000 |
| commit | 11670d3c93210793562748d83502ecbef4034765 (patch) | |
| tree | 9e2c33c6249e26b05a2b5db87d4f4840e9049840 /fs/buffer.c | |
| parent | 575dc34ee0de867ba83abf25998e0963bff451fa (diff) | |
| parent | 01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0 (diff) | |
Merge intel drm-intel-next branch
Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index a3ef091a45b..28f320fac4d 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1165,8 +1165,11 @@ void mark_buffer_dirty(struct buffer_head *bh) if (!test_set_buffer_dirty(bh)) { struct page *page = bh->b_page; - if (!TestSetPageDirty(page)) - __set_page_dirty(page, page_mapping(page), 0); + if (!TestSetPageDirty(page)) { + struct address_space *mapping = page_mapping(page); + if (mapping) + __set_page_dirty(page, mapping, 0); + } } } |