diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /fs/jbd/revoke.c | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jbd/revoke.c')
| -rw-r--r-- | fs/jbd/revoke.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c index d5f8eee7c88c..1bb43e987f4b 100644 --- a/fs/jbd/revoke.c +++ b/fs/jbd/revoke.c | |||
| @@ -138,7 +138,7 @@ repeat: | |||
| 138 | oom: | 138 | oom: |
| 139 | if (!journal_oom_retry) | 139 | if (!journal_oom_retry) |
| 140 | return -ENOMEM; | 140 | return -ENOMEM; |
| 141 | jbd_debug(1, "ENOMEM in %s, retrying\n", __FUNCTION__); | 141 | jbd_debug(1, "ENOMEM in %s, retrying\n", __func__); |
| 142 | yield(); | 142 | yield(); |
| 143 | goto repeat; | 143 | goto repeat; |
| 144 | } | 144 | } |