diff options
| author | Ingo Molnar | 2011-06-16 13:23:15 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2011-06-16 13:23:22 +0200 |
| commit | b4f9f2b64aa189c5584f266f4f0343af7a705441 (patch) | |
| tree | f410718bb93590ff61682b566c10f70d5883bbcd /fs/ceph/addr.c | |
| parent | perf: Split up buffer handling from core code (diff) | |
| parent | Linux 3.0-rc3 (diff) | |
| download | kernel-qcow2-linux-b4f9f2b64aa189c5584f266f4f0343af7a705441.tar.gz kernel-qcow2-linux-b4f9f2b64aa189c5584f266f4f0343af7a705441.tar.xz kernel-qcow2-linux-b4f9f2b64aa189c5584f266f4f0343af7a705441.zip | |
Merge commit 'v3.0-rc3' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ceph/addr.c')
| -rw-r--r-- | fs/ceph/addr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 33da49dc3cc6..5a3953db8118 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -453,7 +453,7 @@ static int ceph_writepage(struct page *page, struct writeback_control *wbc) int err; struct inode *inode = page->mapping->host; BUG_ON(!inode); - igrab(inode); + ihold(inode); err = writepage_nounlock(page, wbc); unlock_page(page); iput(inode); |