diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 12:04:37 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 12:04:37 +0100 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /fs/buffer.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
| download | kernel-crypto-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.tar.gz kernel-crypto-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.tar.xz kernel-crypto-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.zip | |
Merge branch 'master' into devel
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); + } } } |