diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 07:49:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 07:49:46 -0700 |
| commit | da79cbae39516e7bdee8b0edb366e8ff016a9d3e (patch) | |
| tree | 44ebc3f7d3dc1e0c9495b9749eec186daecdb948 /fs | |
| parent | 9ff4680e9958508bebc5c683b98f37b66617e088 (diff) | |
| parent | d58cdfb89ce0c6bd5f81ae931a984ef298dbda20 (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] block layer: ioprio_best function fix
[PATCH] ide-cd: fix breakage with internally queued commands
[PATCH] block layer: elv_iosched_show should get elv_list_lock
[PATCH] splice: fix pipe_to_file() ->prepare_write() error path
[PATCH] block layer: elevator_find function cleanup
[PATCH] elevator: elevator_type member not used
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ioprio.c | 5 | ||||
| -rw-r--r-- | fs/splice.c | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/fs/ioprio.c b/fs/ioprio.c index 6dc6721d9e8..89e8da112a7 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c @@ -150,11 +150,6 @@ int ioprio_best(unsigned short aprio, unsigned short bprio) unsigned short aclass = IOPRIO_PRIO_CLASS(aprio); unsigned short bclass = IOPRIO_PRIO_CLASS(bprio); - if (!ioprio_valid(aprio)) - return bprio; - if (!ioprio_valid(bprio)) - return aprio; - if (aclass == IOPRIO_CLASS_NONE) aclass = IOPRIO_CLASS_BE; if (bclass == IOPRIO_CLASS_NONE) diff --git a/fs/splice.c b/fs/splice.c index 13e92dd19fb..a567010b62a 100644 --- 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)) - goto out_nomem; + goto out_ret; /* * This will also lock the page @@ -666,7 +666,7 @@ find_page: if (sd->pos + this_len > isize) vmtruncate(mapping->host, isize); - goto out; + goto out_ret; } if (buf->page != page) { @@ -698,7 +698,7 @@ find_page: out: page_cache_release(page); unlock_page(page); -out_nomem: +out_ret: return ret; } |