Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 531f710f authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

fat/dir.c: switch to struct __fat_dirent 



struct __fat_dirent is what was formerly the kernel struct dirent (that
was different from the userspace struct dirent).

Converting all fat users to struct __fat_dirent will allow us to get rid
of the conflicting struct dirent definition.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4596c8aa

fs/fat/dir.c

+3 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/slab.h>

#include <linux/time.h>

#include <linux/msdos_fs.h>

#include <linux/dirent.h>

#include <linux/smp_lock.h>

#include <linux/buffer_head.h>

#include <linux/compat.h>
@@ -715,7 +714,7 @@ efault: \ 
	return -EFAULT;							   \

}



FAT_IOCTL_FILLDIR_FUNC(fat_ioctl_filldir, dirent)

FAT_IOCTL_FILLDIR_FUNC(fat_ioctl_filldir, __fat_dirent)



static int fat_ioctl_readdir(struct inode *inode, struct file *filp,

			     void __user *dirent, filldir_t filldir,
@@ -741,7 +740,7 @@ static int fat_ioctl_readdir(struct inode *inode, struct file *filp, 
static int fat_dir_ioctl(struct inode *inode, struct file *filp,

			 unsigned int cmd, unsigned long arg)

{

	struct dirent __user *d1 = (struct dirent __user *)arg;

	struct __fat_dirent __user *d1 = (struct __fat_dirent __user *)arg;

	int short_only, both;



	switch (cmd) {
@@ -757,7 +756,7 @@ static int fat_dir_ioctl(struct inode *inode, struct file *filp, 
		return fat_generic_ioctl(inode, filp, cmd, arg);

	}



	if (!access_ok(VERIFY_WRITE, d1, sizeof(struct dirent[2])))

	if (!access_ok(VERIFY_WRITE, d1, sizeof(struct __fat_dirent[2])))

		return -EFAULT;

	/*

	 * Yes, we don't need this put_user() absolutely. However old