projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
pipe.c
diff --git
a/fs/pipe.c
b/fs/pipe.c
index d79872eba09a56a03ade25f28a9d9cc8c8b86cb8..db6eaaba0dd81fb777f2b64f1e385d40eb3f1819 100644
(file)
--- a/
fs/pipe.c
+++ b/
fs/pipe.c
@@
-230,6
+230,7
@@
void *generic_pipe_buf_map(struct pipe_inode_info *pipe,
return kmap(buf->page);
}
return kmap(buf->page);
}
+EXPORT_SYMBOL(generic_pipe_buf_map);
/**
* generic_pipe_buf_unmap - unmap a previously mapped pipe buffer
/**
* generic_pipe_buf_unmap - unmap a previously mapped pipe buffer
@@
-249,6
+250,7
@@
void generic_pipe_buf_unmap(struct pipe_inode_info *pipe,
} else
kunmap(buf->page);
}
} else
kunmap(buf->page);
}
+EXPORT_SYMBOL(generic_pipe_buf_unmap);
/**
* generic_pipe_buf_steal - attempt to take ownership of a &pipe_buffer
/**
* generic_pipe_buf_steal - attempt to take ownership of a &pipe_buffer
@@
-279,6
+281,7
@@
int generic_pipe_buf_steal(struct pipe_inode_info *pipe,
return 1;
}
return 1;
}
+EXPORT_SYMBOL(generic_pipe_buf_steal);
/**
* generic_pipe_buf_get - get a reference to a &struct pipe_buffer
/**
* generic_pipe_buf_get - get a reference to a &struct pipe_buffer
@@
-294,6
+297,7
@@
void generic_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *buf)
{
page_cache_get(buf->page);
}
{
page_cache_get(buf->page);
}
+EXPORT_SYMBOL(generic_pipe_buf_get);
/**
* generic_pipe_buf_confirm - verify contents of the pipe buffer
/**
* generic_pipe_buf_confirm - verify contents of the pipe buffer
@@
-309,6
+313,7
@@
int generic_pipe_buf_confirm(struct pipe_inode_info *info,
{
return 0;
}
{
return 0;
}
+EXPORT_SYMBOL(generic_pipe_buf_confirm);
/**
* generic_pipe_buf_release - put a reference to a &struct pipe_buffer
/**
* generic_pipe_buf_release - put a reference to a &struct pipe_buffer
@@
-323,6
+328,7
@@
void generic_pipe_buf_release(struct pipe_inode_info *pipe,
{
page_cache_release(buf->page);
}
{
page_cache_release(buf->page);
}
+EXPORT_SYMBOL(generic_pipe_buf_release);
static const struct pipe_buf_operations anon_pipe_buf_ops = {
.can_merge = 1,
static const struct pipe_buf_operations anon_pipe_buf_ops = {
.can_merge = 1,
@@
-1169,14
+1175,18
@@
long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
switch (cmd) {
case F_SETPIPE_SZ:
switch (cmd) {
case F_SETPIPE_SZ:
- if (!capable(CAP_SYS_ADMIN) && arg > pipe_max_pages)
- return -EINVAL;
+ if (!capable(CAP_SYS_ADMIN) && arg > pipe_max_pages) {
+ ret = -EINVAL;
+ goto out;
+ }
/*
* The pipe needs to be at least 2 pages large to
* guarantee POSIX behaviour.
*/
/*
* The pipe needs to be at least 2 pages large to
* guarantee POSIX behaviour.
*/
- if (arg < 2)
- return -EINVAL;
+ if (arg < 2) {
+ ret = -EINVAL;
+ goto out;
+ }
ret = pipe_set_size(pipe, arg);
break;
case F_GETPIPE_SZ:
ret = pipe_set_size(pipe, arg);
break;
case F_GETPIPE_SZ:
@@
-1187,6
+1197,7
@@
long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
break;
}
break;
}
+out:
mutex_unlock(&pipe->inode->i_mutex);
return ret;
}
mutex_unlock(&pipe->inode->i_mutex);
return ret;
}