Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
811803c5
Commit
811803c5
authored
Nov 17, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
parents
42f9cabe
d5ea6553
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
0 deletions
+36
-0
fs/compat_ioctl.c
fs/compat_ioctl.c
+36
-0
No files found.
fs/compat_ioctl.c
View file @
811803c5
...
...
@@ -49,6 +49,8 @@
#include <linux/vt_kern.h>
#include <linux/fb.h>
#include <linux/ext2_fs.h>
#include <linux/ext3_jbd.h>
#include <linux/ext3_fs.h>
#include <linux/videodev.h>
#include <linux/netdevice.h>
#include <linux/raw.h>
...
...
@@ -134,6 +136,15 @@
/* Aiee. Someone does not find a difference between int and long */
#define EXT2_IOC32_GETFLAGS _IOR('f', 1, int)
#define EXT2_IOC32_SETFLAGS _IOW('f', 2, int)
#define EXT3_IOC32_GETVERSION _IOR('f', 3, int)
#define EXT3_IOC32_SETVERSION _IOR('f', 4, int)
#define EXT3_IOC32_GETRSVSZ _IOR('f', 5, int)
#define EXT3_IOC32_SETRSVSZ _IOW('f', 6, int)
#define EXT3_IOC32_GROUP_EXTEND _IOW('f', 7, unsigned int)
#ifdef CONFIG_JBD_DEBUG
#define EXT3_IOC32_WAIT_FOR_READONLY _IOR('f', 99, int)
#endif
#define EXT2_IOC32_GETVERSION _IOR('v', 1, int)
#define EXT2_IOC32_SETVERSION _IOW('v', 2, int)
...
...
@@ -180,6 +191,22 @@ static int do_ext2_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
return
sys_ioctl
(
fd
,
cmd
,
(
unsigned
long
)
compat_ptr
(
arg
));
}
static
int
do_ext3_ioctl
(
unsigned
int
fd
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
/* These are just misnamed, they actually get/put from/to user an int */
switch
(
cmd
)
{
case
EXT3_IOC32_GETVERSION
:
cmd
=
EXT3_IOC_GETVERSION
;
break
;
case
EXT3_IOC32_SETVERSION
:
cmd
=
EXT3_IOC_SETVERSION
;
break
;
case
EXT3_IOC32_GETRSVSZ
:
cmd
=
EXT3_IOC_GETRSVSZ
;
break
;
case
EXT3_IOC32_SETRSVSZ
:
cmd
=
EXT3_IOC_SETRSVSZ
;
break
;
case
EXT3_IOC32_GROUP_EXTEND
:
cmd
=
EXT3_IOC_GROUP_EXTEND
;
break
;
#ifdef CONFIG_JBD_DEBUG
case
EXT3_IOC32_WAIT_FOR_READONLY
:
cmd
=
EXT3_IOC_WAIT_FOR_READONLY
;
break
;
#endif
}
return
sys_ioctl
(
fd
,
cmd
,
(
unsigned
long
)
compat_ptr
(
arg
));
}
struct
video_tuner32
{
compat_int_t
tuner
;
char
name
[
32
];
...
...
@@ -2981,6 +3008,15 @@ HANDLE_IOCTL(EXT2_IOC32_GETFLAGS, do_ext2_ioctl)
HANDLE_IOCTL
(
EXT2_IOC32_SETFLAGS
,
do_ext2_ioctl
)
HANDLE_IOCTL
(
EXT2_IOC32_GETVERSION
,
do_ext2_ioctl
)
HANDLE_IOCTL
(
EXT2_IOC32_SETVERSION
,
do_ext2_ioctl
)
HANDLE_IOCTL
(
EXT3_IOC32_GETVERSION
,
do_ext3_ioctl
)
HANDLE_IOCTL
(
EXT3_IOC32_SETVERSION
,
do_ext3_ioctl
)
HANDLE_IOCTL
(
EXT3_IOC32_GETRSVSZ
,
do_ext3_ioctl
)
HANDLE_IOCTL
(
EXT3_IOC32_SETRSVSZ
,
do_ext3_ioctl
)
HANDLE_IOCTL
(
EXT3_IOC32_GROUP_EXTEND
,
do_ext3_ioctl
)
COMPATIBLE_IOCTL
(
EXT3_IOC_GROUP_ADD
)
#ifdef CONFIG_JBD_DEBUG
HANDLE_IOCTL
(
EXT3_IOC32_WAIT_FOR_READONLY
,
do_ext3_ioctl
)
#endif
HANDLE_IOCTL
(
VIDIOCGTUNER32
,
do_video_ioctl
)
HANDLE_IOCTL
(
VIDIOCSTUNER32
,
do_video_ioctl
)
HANDLE_IOCTL
(
VIDIOCGWIN32
,
do_video_ioctl
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment