Commit 3e766fd4 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: convert to unlocked_ioctl
  fat: Cleanup nls_unload() usage
  fat: use pack_hex_byte() instead of custom one
parents 4fd5ec50 7845bc3e
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/kernel.h>
#include "fat.h" #include "fat.h"
/* /*
...@@ -140,28 +141,22 @@ static int uni16_to_x8(unsigned char *ascii, const wchar_t *uni, int len, ...@@ -140,28 +141,22 @@ static int uni16_to_x8(unsigned char *ascii, const wchar_t *uni, int len,
{ {
const wchar_t *ip; const wchar_t *ip;
wchar_t ec; wchar_t ec;
unsigned char *op, nc; unsigned char *op;
int charlen; int charlen;
int k;
ip = uni; ip = uni;
op = ascii; op = ascii;
while (*ip && ((len - NLS_MAX_CHARSET_SIZE) > 0)) { while (*ip && ((len - NLS_MAX_CHARSET_SIZE) > 0)) {
ec = *ip++; ec = *ip++;
if ( (charlen = nls->uni2char(ec, op, NLS_MAX_CHARSET_SIZE)) > 0) { if ((charlen = nls->uni2char(ec, op, NLS_MAX_CHARSET_SIZE)) > 0) {
op += charlen; op += charlen;
len -= charlen; len -= charlen;
} else { } else {
if (uni_xlate == 1) { if (uni_xlate == 1) {
*op = ':'; *op++ = ':';
for (k = 4; k > 0; k--) { op = pack_hex_byte(op, ec >> 8);
nc = ec & 0xF; op = pack_hex_byte(op, ec);
op[k] = nc > 9 ? nc + ('a' - 10)
: nc + '0';
ec >>= 4;
}
op += 5;
len -= 5; len -= 5;
} else { } else {
*op++ = '?'; *op++ = '?';
...@@ -758,9 +753,10 @@ static int fat_ioctl_readdir(struct inode *inode, struct file *filp, ...@@ -758,9 +753,10 @@ static int fat_ioctl_readdir(struct inode *inode, struct file *filp,
return ret; return ret;
} }
static int fat_dir_ioctl(struct inode *inode, struct file *filp, static long fat_dir_ioctl(struct file *filp, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
struct inode *inode = filp->f_path.dentry->d_inode;
struct __fat_dirent __user *d1 = (struct __fat_dirent __user *)arg; struct __fat_dirent __user *d1 = (struct __fat_dirent __user *)arg;
int short_only, both; int short_only, both;
...@@ -774,7 +770,7 @@ static int fat_dir_ioctl(struct inode *inode, struct file *filp, ...@@ -774,7 +770,7 @@ static int fat_dir_ioctl(struct inode *inode, struct file *filp,
both = 1; both = 1;
break; break;
default: default:
return fat_generic_ioctl(inode, filp, cmd, arg); return fat_generic_ioctl(filp, cmd, arg);
} }
if (!access_ok(VERIFY_WRITE, d1, sizeof(struct __fat_dirent[2]))) if (!access_ok(VERIFY_WRITE, d1, sizeof(struct __fat_dirent[2])))
...@@ -814,7 +810,7 @@ static long fat_compat_dir_ioctl(struct file *filp, unsigned cmd, ...@@ -814,7 +810,7 @@ static long fat_compat_dir_ioctl(struct file *filp, unsigned cmd,
both = 1; both = 1;
break; break;
default: default:
return -ENOIOCTLCMD; return fat_generic_ioctl(filp, cmd, (unsigned long)arg);
} }
if (!access_ok(VERIFY_WRITE, d1, sizeof(struct compat_dirent[2]))) if (!access_ok(VERIFY_WRITE, d1, sizeof(struct compat_dirent[2])))
...@@ -836,7 +832,7 @@ const struct file_operations fat_dir_operations = { ...@@ -836,7 +832,7 @@ const struct file_operations fat_dir_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = generic_read_dir, .read = generic_read_dir,
.readdir = fat_readdir, .readdir = fat_readdir,
.ioctl = fat_dir_ioctl, .unlocked_ioctl = fat_dir_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = fat_compat_dir_ioctl, .compat_ioctl = fat_compat_dir_ioctl,
#endif #endif
......
...@@ -298,8 +298,8 @@ extern int fat_free_clusters(struct inode *inode, int cluster); ...@@ -298,8 +298,8 @@ extern int fat_free_clusters(struct inode *inode, int cluster);
extern int fat_count_free_clusters(struct super_block *sb); extern int fat_count_free_clusters(struct super_block *sb);
/* fat/file.c */ /* fat/file.c */
extern int fat_generic_ioctl(struct inode *inode, struct file *filp, extern long fat_generic_ioctl(struct file *filp, unsigned int cmd,
unsigned int cmd, unsigned long arg); unsigned long arg);
extern const struct file_operations fat_file_operations; extern const struct file_operations fat_file_operations;
extern const struct inode_operations fat_file_inode_operations; extern const struct inode_operations fat_file_inode_operations;
extern int fat_setattr(struct dentry * dentry, struct iattr * attr); extern int fat_setattr(struct dentry * dentry, struct iattr * attr);
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/compat.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
...@@ -114,9 +115,9 @@ static int fat_ioctl_set_attributes(struct file *file, u32 __user *user_attr) ...@@ -114,9 +115,9 @@ static int fat_ioctl_set_attributes(struct file *file, u32 __user *user_attr)
return err; return err;
} }
int fat_generic_ioctl(struct inode *inode, struct file *filp, long fat_generic_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
struct inode *inode = filp->f_path.dentry->d_inode;
u32 __user *user_attr = (u32 __user *)arg; u32 __user *user_attr = (u32 __user *)arg;
switch (cmd) { switch (cmd) {
...@@ -129,6 +130,15 @@ int fat_generic_ioctl(struct inode *inode, struct file *filp, ...@@ -129,6 +130,15 @@ int fat_generic_ioctl(struct inode *inode, struct file *filp,
} }
} }
#ifdef CONFIG_COMPAT
static long fat_generic_compat_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg)
{
return fat_generic_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));
}
#endif
static int fat_file_release(struct inode *inode, struct file *filp) static int fat_file_release(struct inode *inode, struct file *filp)
{ {
if ((filp->f_mode & FMODE_WRITE) && if ((filp->f_mode & FMODE_WRITE) &&
...@@ -159,7 +169,10 @@ const struct file_operations fat_file_operations = { ...@@ -159,7 +169,10 @@ const struct file_operations fat_file_operations = {
.aio_write = generic_file_aio_write, .aio_write = generic_file_aio_write,
.mmap = generic_file_mmap, .mmap = generic_file_mmap,
.release = fat_file_release, .release = fat_file_release,
.ioctl = fat_generic_ioctl, .unlocked_ioctl = fat_generic_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = fat_generic_compat_ioctl,
#endif
.fsync = fat_file_fsync, .fsync = fat_file_fsync,
.splice_read = generic_file_splice_read, .splice_read = generic_file_splice_read,
}; };
......
...@@ -1497,10 +1497,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, ...@@ -1497,10 +1497,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
iput(fat_inode); iput(fat_inode);
if (root_inode) if (root_inode)
iput(root_inode); iput(root_inode);
if (sbi->nls_io) unload_nls(sbi->nls_io);
unload_nls(sbi->nls_io); unload_nls(sbi->nls_disk);
if (sbi->nls_disk)
unload_nls(sbi->nls_disk);
if (sbi->options.iocharset != fat_default_iocharset) if (sbi->options.iocharset != fat_default_iocharset)
kfree(sbi->options.iocharset); kfree(sbi->options.iocharset);
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment