Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
fs
/
jbd2
/
checkpoint.c
diff --git
a/kernel/fs/jbd2/checkpoint.c
b/kernel/fs/jbd2/checkpoint.c
index
78c1545
..
6e18a06
100644
(file)
--- a/
kernel/fs/jbd2/checkpoint.c
+++ b/
kernel/fs/jbd2/checkpoint.c
@@
-429,7
+429,6
@@
static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
struct journal_head *last_jh;
struct journal_head *next_jh = jh;
int ret;
struct journal_head *last_jh;
struct journal_head *next_jh = jh;
int ret;
- int freed = 0;
if (!jh)
return 0;
if (!jh)
return 0;
@@
-443,10
+442,9
@@
static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
else
ret = __jbd2_journal_remove_checkpoint(jh) + 1;
if (!ret)
else
ret = __jbd2_journal_remove_checkpoint(jh) + 1;
if (!ret)
- return
freed
;
+ return
0
;
if (ret == 2)
return 1;
if (ret == 2)
return 1;
- freed = 1;
/*
* This function only frees up some memory
* if possible so we dont have an obligation
/*
* This function only frees up some memory
* if possible so we dont have an obligation
@@
-454,10
+452,10
@@
static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
* requested:
*/
if (need_resched())
* requested:
*/
if (need_resched())
- return
freed
;
+ return
0
;
} while (jh != last_jh);
} while (jh != last_jh);
- return
freed
;
+ return
0
;
}
/*
}
/*