diff options
| author | dmitry pervushin <dmitry.pervushin@linaro.org> | 2013-05-16 10:49:02 +0200 |
|---|---|---|
| committer | Bernhard Rosenkränzer <bero@lindev.ch> | 2013-07-18 20:49:00 +0200 |
| commit | 85f9e306c793026773429b59bf700ed24ed3b3ed (patch) | |
| tree | 04844a2198210451e21daad991b91393dc6553a8 | |
| parent | f5f81853bdc8aa74e265648b67bab50ab148c4da (diff) | |
VFAT GET_VOLUME_ID ioctl
Rename VFAT_IOCTL_GET_VOLUME_ID to VFAT_IOCTL_GET_VOLUME_ID_BROKEN
This ioctl returns the volume id via return value, which might be
incorrect in some cases, for example, if id is 0xFFFFFDAD, that
matches -ENOIOCTL.
So this ioctl will be deprecated and kept only for compatibility.
Signed-off-by: dmitry pervushin <dmitry.pervushin@linaro.org>
| -rw-r--r-- | fs/fat/dir.c | 2 | ||||
| -rw-r--r-- | include/uapi/linux/msdos_fs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 4b775e606fc..cb0e9b10953 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -799,7 +799,7 @@ static long fat_dir_ioctl(struct file *filp, unsigned int cmd, short_only = 0; both = 1; break; - case VFAT_IOCTL_GET_VOLUME_ID: + case VFAT_IOCTL_GET_VOLUME_ID_BROKEN: return fat_ioctl_volume_id(inode); default: return fat_generic_ioctl(filp, cmd, arg); diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h index db4ae0cd16c..fddfc61418d 100644 --- a/include/uapi/linux/msdos_fs.h +++ b/include/uapi/linux/msdos_fs.h @@ -104,7 +104,7 @@ struct __fat_dirent { /* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */ #define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) #define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32) -#define VFAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x12, __u32) +#define VFAT_IOCTL_GET_VOLUME_ID_BROKEN _IOR('r', 0x12, __u32) struct fat_boot_sector { __u8 ignored[3]; /* Boot strap short or near jump */ |