diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /fs/ext2/ioctl.c | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'fs/ext2/ioctl.c')
| -rw-r--r-- | fs/ext2/ioctl.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c index 4d54fd354..a582fd545 100644 --- a/fs/ext2/ioctl.c +++ b/fs/ext2/ioctl.c @@ -7,14 +7,11 @@ * Universite Pierre et Marie Curie (Paris VI) */ -#include <asm/uaccess.h> - -#include <linux/errno.h> +#include <linux/module.h> #include <linux/fs.h> -#include <linux/ext2_fs.h> -#include <linux/ioctl.h> #include <linux/sched.h> -#include <linux/mm.h> +#include <asm/uaccess.h> + int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, unsigned long arg) @@ -26,7 +23,7 @@ int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, switch (cmd) { case EXT2_IOC_GETFLAGS: flags = inode->u.ext2_i.i_flags & EXT2_FL_USER_VISIBLE; - return put_user(inode->u.ext2_i.i_flags, (int *) arg); + return put_user(flags, (int *) arg); case EXT2_IOC_SETFLAGS: { unsigned int oldflags; |