diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 07:41:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 07:41:47 -0700 |
| commit | 3e766fd41ddc31c47ec5b2840c6a45803d35ff40 (patch) | |
| tree | f007442f20757918aa024dda848baa7670baa580 /fs/fat/fat.h | |
| parent | 4fd5ec509bd486b5dd8cac1a4d4d7e2cbdf7c546 (diff) | |
| parent | 7845bc3e132605e3e8a1f37748e29281164b65f5 (diff) | |
| download | op-kernel-dev-3e766fd41ddc31c47ec5b2840c6a45803d35ff40.zip op-kernel-dev-3e766fd41ddc31c47ec5b2840c6a45803d35ff40.tar.gz | |
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
Diffstat (limited to 'fs/fat/fat.h')
| -rw-r--r-- | fs/fat/fat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fat/fat.h b/fs/fat/fat.h index e6efdfa..eb821ee 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -298,8 +298,8 @@ extern int fat_free_clusters(struct inode *inode, int cluster); extern int fat_count_free_clusters(struct super_block *sb); /* fat/file.c */ -extern int fat_generic_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); +extern long fat_generic_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg); extern const struct file_operations fat_file_operations; extern const struct inode_operations fat_file_inode_operations; extern int fat_setattr(struct dentry * dentry, struct iattr * attr); |
