projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VFS: update to new unlocked_ioctl()
[lttng-modules.git]
/
ltt-relay-vfs.c
diff --git
a/ltt-relay-vfs.c
b/ltt-relay-vfs.c
index defbe2df1fbdfc30454987e49ccceb34b8a41212..5abef777252ba4c51618c1b2d4b62a567e048277 100644
(file)
--- a/
ltt-relay-vfs.c
+++ b/
ltt-relay-vfs.c
@@
-109,7
+109,6
@@
static unsigned int ltt_poll(struct file *filp, poll_table *wait)
/**
* ltt_ioctl - control on the debugfs file
*
/**
* ltt_ioctl - control on the debugfs file
*
- * @inode: the inode
* @filp: the file
* @cmd: the command
* @arg: command arg
* @filp: the file
* @cmd: the command
* @arg: command arg
@@
-129,9
+128,9
@@
static unsigned int ltt_poll(struct file *filp, poll_table *wait)
* returns the maximum size for sub-buffers.
*/
static
* returns the maximum size for sub-buffers.
*/
static
-int ltt_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
- unsigned long arg)
+long ltt_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
{
+ struct inode *inode = filp->f_dentry->d_inode;
struct ltt_chanbuf *buf = inode->i_private;
u32 __user *argp = (u32 __user *)arg;
struct ltt_chanbuf *buf = inode->i_private;
u32 __user *argp = (u32 __user *)arg;
@@
-185,13
+184,7
@@
int ltt_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
static
long ltt_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
static
long ltt_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- long ret = -ENOIOCTLCMD;
-
- lock_kernel();
- ret = ltt_ioctl(file->f_dentry->d_inode, file, cmd, arg);
- unlock_kernel();
-
- return ret;
+ return ltt_ioctl(file, cmd, arg);
}
#endif
}
#endif
@@
-200,7
+193,7
@@
static const struct file_operations ltt_file_operations = {
.release = ltt_release,
.poll = ltt_poll,
.splice_read = ltt_relay_file_splice_read,
.release = ltt_release,
.poll = ltt_poll,
.splice_read = ltt_relay_file_splice_read,
- .ioctl = ltt_ioctl,
+ .
unlocked_
ioctl = ltt_ioctl,
.llseek = ltt_relay_no_llseek,
#ifdef CONFIG_COMPAT
.compat_ioctl = ltt_compat_ioctl,
.llseek = ltt_relay_no_llseek,
#ifdef CONFIG_COMPAT
.compat_ioctl = ltt_compat_ioctl,
This page took
0.024596 seconds
and
4
git commands to generate.