projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: ipt_ECN/ipt_TOS: fix incorrect checksum update
[powerpc.git]
/
fs
/
splice.c
diff --git
a/fs/splice.c
b/fs/splice.c
index
13e92dd
..
a567010
100644
(file)
--- a/
fs/splice.c
+++ b/
fs/splice.c
@@
-607,7
+607,7
@@
find_page:
ret = -ENOMEM;
page = page_cache_alloc_cold(mapping);
if (unlikely(!page))
ret = -ENOMEM;
page = page_cache_alloc_cold(mapping);
if (unlikely(!page))
- goto out_
nomem
;
+ goto out_
ret
;
/*
* This will also lock the page
/*
* This will also lock the page
@@
-666,7
+666,7
@@
find_page:
if (sd->pos + this_len > isize)
vmtruncate(mapping->host, isize);
if (sd->pos + this_len > isize)
vmtruncate(mapping->host, isize);
- goto out;
+ goto out
_ret
;
}
if (buf->page != page) {
}
if (buf->page != page) {
@@
-698,7
+698,7
@@
find_page:
out:
page_cache_release(page);
unlock_page(page);
out:
page_cache_release(page);
unlock_page(page);
-out_
nomem
:
+out_
ret
:
return ret;
}
return ret;
}