diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-23 00:03:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-23 00:03:00 +0200 |
| commit | 8400146d0dc03590bba051399e4bb7e1cbf1c010 (patch) | |
| tree | 4c0c88273ff31e5e5f51c10d8727acab460b57ec /fs/buffer.c | |
| parent | 39cf0518d89d1f0af79554457c52adb5b12fa43c (diff) | |
| parent | 3edf2fb9d80a46d6c32ba12547a42419845b4b76 (diff) | |
| download | kernel_replicant_linux-8400146d0dc03590bba051399e4bb7e1cbf1c010.tar.gz kernel_replicant_linux-8400146d0dc03590bba051399e4bb7e1cbf1c010.tar.bz2 kernel_replicant_linux-8400146d0dc03590bba051399e4bb7e1cbf1c010.zip | |
Merge branch 'master' into for-linus
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 a3ef091a45bd..28f320fac4d4 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); + } } } |