diff options
| author | Sage Weil | 2010-08-24 17:44:16 +0200 |
|---|---|---|
| committer | Sage Weil | 2010-08-25 01:24:18 +0200 |
| commit | 7d8cb26d7dcb911f110b7762bd5941e8f009d6c3 (patch) | |
| tree | 2adf2f6303cc96ff14c951dc6966f68a0fc3cf25 /fs/ceph/addr.c | |
| parent | ceph: fix osd request lru adjustment when sending request (diff) | |
| download | kernel-qcow2-linux-7d8cb26d7dcb911f110b7762bd5941e8f009d6c3.tar.gz kernel-qcow2-linux-7d8cb26d7dcb911f110b7762bd5941e8f009d6c3.tar.xz kernel-qcow2-linux-7d8cb26d7dcb911f110b7762bd5941e8f009d6c3.zip | |
ceph: maintain i_head_snapc when any caps are dirty, not just for data
We used to use i_head_snapc to keep track of which snapc the current epoch
of dirty data was dirtied under. It is used by queue_cap_snap to set up
the cap_snap. However, since we queue cap snaps for any dirty caps, not
just for dirty file data, we need to keep a valid i_head_snapc anytime
we have dirty|flushing caps. This fixes a NULL pointer deref in
queue_cap_snap when writing back dirty caps without data (e.g.,
snaptest-authwb.sh).
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/addr.c')
| -rw-r--r-- | fs/ceph/addr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 420d46974ec8..4cfce1ee31fa 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -87,7 +87,7 @@ static int ceph_set_page_dirty(struct page *page) /* dirty the head */ spin_lock(&inode->i_lock); - if (ci->i_wrbuffer_ref_head == 0) + if (ci->i_head_snapc == NULL) ci->i_head_snapc = ceph_get_snap_context(snapc); ++ci->i_wrbuffer_ref_head; if (ci->i_wrbuffer_ref == 0) @@ -346,7 +346,7 @@ static struct ceph_snap_context *get_oldest_context(struct inode *inode, break; } } - if (!snapc && ci->i_head_snapc) { + if (!snapc && ci->i_wrbuffer_ref_head) { snapc = ceph_get_snap_context(ci->i_head_snapc); dout(" head snapc %p has %d dirty pages\n", snapc, ci->i_wrbuffer_ref_head); |