Commit 53c9c5c0 authored by Al Viro's avatar Al Viro
Browse files

[PATCH] prepare vfs_readdir() callers to returning filldir result 



It's not the final state, but it allows moving ->readdir() instances
to passing filldir return value to caller of vfs_readdir().

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a9885444

arch/alpha/kernel/osf_sys.c

+2 −5
Original line number Diff line number Diff line
@@ -165,14 +165,11 @@ osf_getdirentries(unsigned int fd, struct osf_dirent __user *dirent, 
	buf.error = 0;



	error = vfs_readdir(file, osf_filldir, &buf);

	if (error < 0)

		goto out_putf;



	if (error >= 0)

		error = buf.error;

	if (count != buf.count)

		error = count - buf.count;



 out_putf:

	fput(file);

 out:

	return error;

arch/parisc/hpux/fs.c

+2 −3
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned i 
	buf.error = 0;



	error = vfs_readdir(file, filldir, &buf);

	if (error < 0)

		goto out_putf;

	if (error >= 0)

		error = buf.error;

	lastdirent = buf.previous;

	if (lastdirent) {

fs/compat.c

+8 −14
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd, 
	buf.dirent = dirent;



	error = vfs_readdir(file, compat_fillonedir, &buf);

	if (error >= 0)

	if (buf.result)

		error = buf.result;



	fput(file);
@@ -956,8 +956,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, 
	buf.error = 0;



	error = vfs_readdir(file, compat_filldir, &buf);

	if (error < 0)

		goto out_putf;

	if (error >= 0)

		error = buf.error;

	lastdirent = buf.previous;

	if (lastdirent) {
@@ -966,8 +965,6 @@ asmlinkage long compat_sys_getdents(unsigned int fd, 
		else

			error = count - buf.count;

	}



out_putf:

	fput(file);

out:

	return error;
@@ -1047,19 +1044,16 @@ asmlinkage long compat_sys_getdents64(unsigned int fd, 
	buf.error = 0;



	error = vfs_readdir(file, compat_filldir64, &buf);

	if (error < 0)

		goto out_putf;

	if (error >= 0)

		error = buf.error;

	lastdirent = buf.previous;

	if (lastdirent) {

		typeof(lastdirent->d_off) d_off = file->f_pos;

		error = -EFAULT;

		if (__put_user_unaligned(d_off, &lastdirent->d_off))

			goto out_putf;

			error = -EFAULT;

		else

			error = count - buf.count;

	}



out_putf:

	fput(file);

out:

	return error;

fs/exportfs/expfs.c

+4 −3
Original line number Diff line number Diff line
@@ -280,13 +280,14 @@ static int get_name(struct vfsmount *mnt, struct dentry *dentry, 
		int old_seq = buffer.sequence;



		error = vfs_readdir(file, filldir_one, &buffer);

		if (buffer.found) {

			error = 0;

			break;

		}



		if (error < 0)

			break;



		error = 0;

		if (buffer.found)

			break;

		error = -ENOENT;

		if (old_seq == buffer.sequence)

			break;

fs/nfsd/vfs.c

+9 −2
Original line number Diff line number Diff line
@@ -1831,6 +1831,7 @@ struct buffered_dirent { 
struct readdir_data {

	char		*dirent;

	size_t		used;

	int		full;

};



static int nfsd_buffered_filldir(void *__buf, const char *name, int namlen,
@@ -1841,8 +1842,10 @@ static int nfsd_buffered_filldir(void *__buf, const char *name, int namlen, 
	unsigned int reclen;



	reclen = ALIGN(sizeof(struct buffered_dirent) + namlen, sizeof(u64));

	if (buf->used + reclen > PAGE_SIZE)

	if (buf->used + reclen > PAGE_SIZE) {

		buf->full = 1;

		return -EINVAL;

	}



	de->namlen = namlen;

	de->offset = offset;
@@ -1874,9 +1877,13 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, 
		unsigned int reclen;



		buf.used = 0;

		buf.full = 0;



		host_err = vfs_readdir(file, nfsd_buffered_filldir, &buf);

		if (host_err)

		if (buf.full)

			host_err = 0;



		if (host_err < 0)

			break;



		size = buf.used;