diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-06-28 11:01:56 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-06-28 11:01:56 -0700 |
| commit | ef0387e0685968f114da5ffa2df260d1ea13aa52 (patch) | |
| tree | 8b7e65359a0d0658372ed64bccbb3f2d5f053f8a | |
| parent | f338c4331509c1e9f9b125fd57db733b57017742 (diff) | |
| parent | 3a42e7bde8fe0d07658db32453facffc71c988f8 (diff) | |
Merge branch 'linaro-fixes/experimental/android-3.10' into linaro-android-3.10-experimentaltracking-linaro-android-3.10-llct-20130701.0
| -rw-r--r-- | fs/fat/dir.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c index ddfa4529e6ea..4b775e606fc8 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -841,6 +841,8 @@ static long fat_compat_dir_ioctl(struct file *filp, unsigned cmd, short_only = 0; both = 1; break; + case VFAT_IOCTL_GET_VOLUME_ID: + return fat_ioctl_volume_id(inode); default: return fat_generic_ioctl(filp, cmd, (unsigned long)arg); } |