diff --git a/[refs] b/[refs] index 36d4d25fd6c2..9cb0dd15e096 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7f21e4f5a3d4e378e4d453b2be209dcfd1bb964 +refs/heads/master: 9aefe431f5a000884db7ae74ac208de814fe5913 diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index b450acdff397..26f5f7ecee5c 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -445,7 +445,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf, ret = -ENOMEM; page = find_or_create_page(mapping, index, gfp_mask); if (!page) - goto out; + goto out_nomem; /* * If the page is uptodate, it is also locked. If it isn't @@ -508,6 +508,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf, page_cache_release(page); unlock_page(page); } +out_nomem: buf->ops->unmap(info, buf); return ret; }