Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347818
b: refs/heads/master
c: 37491a1
h: refs/heads/master
v: v3
  • Loading branch information
David Howells committed Dec 20, 2012
1 parent 8285f2d commit 2b4d0ff
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f972b5696c0a0677a9b3a18fee45cc0e8de4184
refs/heads/master: 37491a1339df26259b06dfa33f30e574e9e52034
14 changes: 7 additions & 7 deletions trunk/fs/cachefiles/rdwr.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,25 @@ static int cachefiles_read_reissue(struct cachefiles_object *object,
struct page *backpage = monitor->back_page, *backpage2;
int ret;

kenter("{ino=%lx},{%lx,%lx}",
_enter("{ino=%lx},{%lx,%lx}",
object->backer->d_inode->i_ino,
backpage->index, backpage->flags);

/* skip if the page was truncated away completely */
if (backpage->mapping != bmapping) {
kleave(" = -ENODATA [mapping]");
_leave(" = -ENODATA [mapping]");
return -ENODATA;
}

backpage2 = find_get_page(bmapping, backpage->index);
if (!backpage2) {
kleave(" = -ENODATA [gone]");
_leave(" = -ENODATA [gone]");
return -ENODATA;
}

if (backpage != backpage2) {
put_page(backpage2);
kleave(" = -ENODATA [different]");
_leave(" = -ENODATA [different]");
return -ENODATA;
}

Expand All @@ -114,7 +114,7 @@ static int cachefiles_read_reissue(struct cachefiles_object *object,
if (PageUptodate(backpage))
goto unlock_discard;

kdebug("reissue read");
_debug("reissue read");
ret = bmapping->a_ops->readpage(NULL, backpage);
if (ret < 0)
goto unlock_discard;
Expand All @@ -129,15 +129,15 @@ static int cachefiles_read_reissue(struct cachefiles_object *object,
}

/* it'll reappear on the todo list */
kleave(" = -EINPROGRESS");
_leave(" = -EINPROGRESS");
return -EINPROGRESS;

unlock_discard:
unlock_page(backpage);
spin_lock_irq(&object->work_lock);
list_del(&monitor->op_link);
spin_unlock_irq(&object->work_lock);
kleave(" = %d", ret);
_leave(" = %d", ret);
return ret;
}

Expand Down

0 comments on commit 2b4d0ff

Please sign in to comment.