Commit 5b51a7e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  [PATCH] deal with the first call of ->show() generating no output
  [PATCH] fix ->llseek() for a bunch of directories
  [PATCH] fix regular readdir() and friends
  [PATCH] fix hpux_getdents()
  [PATCH] fix osf_getdirents()
  [PATCH] ntfs: use d_add_ci
  [PATCH] change d_add_ci argument ordering
  [PATCH] fix efs_lookup()
  [PATCH] proc: inode number fixlet
parents 3d87ff3e 4cdfe84b

arch/alpha/kernel/osf_sys.c

+12 −7
Original line number Diff line number Diff line
@@ -121,24 +121,29 @@ osf_filldir(void *__buf, const char *name, int namlen, loff_t offset, 
	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {

		buf->error = -EOVERFLOW;

		return -EOVERFLOW;

	}

	if (buf->basep) {

		if (put_user(offset, buf->basep))

			return -EFAULT;

			goto Efault;

		buf->basep = NULL;

	}

	dirent = buf->dirent;

	put_user(d_ino, &dirent->d_ino);

	put_user(namlen, &dirent->d_namlen);

	put_user(reclen, &dirent->d_reclen);

	if (copy_to_user(dirent->d_name, name, namlen) ||

	if (put_user(d_ino, &dirent->d_ino) ||

	    put_user(namlen, &dirent->d_namlen) ||

	    put_user(reclen, &dirent->d_reclen) ||

	    copy_to_user(dirent->d_name, name, namlen) ||

	    put_user(0, dirent->d_name + namlen))

		return -EFAULT;

		goto Efault;

	dirent = (void __user *)dirent + reclen;

	buf->dirent = dirent;

	buf->count -= reclen;

	return 0;

Efault:

	buf->error = -EFAULT;

	return -EFAULT;

}



asmlinkage int

arch/parisc/hpux/fs.c

+19 −11
Original line number Diff line number Diff line
@@ -84,22 +84,28 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, 
	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {

		buf->error = -EOVERFLOW;

		return -EOVERFLOW;

	}

	dirent = buf->previous;

	if (dirent)

		put_user(offset, &dirent->d_off);

		if (put_user(offset, &dirent->d_off))

			goto Efault;

	dirent = buf->current_dir;

	if (put_user(d_ino, &dirent->d_ino) ||

	    put_user(reclen, &dirent->d_reclen) ||

	    put_user(namlen, &dirent->d_namlen) ||

	    copy_to_user(dirent->d_name, name, namlen) ||

	    put_user(0, dirent->d_name + namlen))

		goto Efault;

	buf->previous = dirent;

	put_user(d_ino, &dirent->d_ino);

	put_user(reclen, &dirent->d_reclen);

	put_user(namlen, &dirent->d_namlen);

	copy_to_user(dirent->d_name, name, namlen);

	put_user(0, dirent->d_name + namlen);

	dirent = (void __user *)dirent + reclen;

	buf->current_dir = dirent;

	buf->current_dir = (void __user *)dirent + reclen;

	buf->count -= reclen;

	return 0;

Efault:

	buffer->error = -EFAULT;

	return -EFAULT;

}



#undef NAME_OFFSET
@@ -126,7 +132,9 @@ int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned i 
	error = buf.error;

	lastdirent = buf.previous;

	if (lastdirent) {

		put_user(file->f_pos, &lastdirent->d_off);

		if (put_user(file->f_pos, &lastdirent->d_off))

			error = -EFAULT;

		else

			error = count - buf.count;

	}

fs/9p/vfs_dir.c

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 


const struct file_operations v9fs_dir_operations = {

	.read = generic_read_dir,

	.llseek = generic_file_llseek,

	.readdir = v9fs_dir_readdir,

	.open = v9fs_file_open,

	.release = v9fs_dir_release,

fs/adfs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ out: 


const struct file_operations adfs_dir_operations = {

	.read		= generic_read_dir,

	.llseek		= generic_file_llseek,

	.readdir	= adfs_readdir,

	.fsync		= file_fsync,

};

fs/affs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ static int affs_readdir(struct file *, void *, filldir_t); 


const struct file_operations affs_dir_operations = {

	.read		= generic_read_dir,

	.llseek		= generic_file_llseek,

	.readdir	= affs_readdir,

	.fsync		= file_fsync,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE