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

Commit 25606656 authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

NFS: remove error field from nfs_readdir_descriptor_t 



The error field in nfs_readdir_descriptor_t is never used outside of the
function in which it is set. Remove the field and change the place that
does use it to use an existing local variable.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 497799e7

fs/nfs/dir.c

+3 −5
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ typedef struct { 
	struct nfs_entry *entry;

	decode_dirent_t	decode;

	int		plus;

	int		error;

	unsigned long	timestamp;

	int		timestamp_valid;

} nfs_readdir_descriptor_t;
@@ -213,7 +212,6 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page) 
	return 0;

 error:

	unlock_page(page);

	desc->error = error;

	return -EIO;

}
@@ -483,13 +481,13 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, 
		goto out;

	}

	timestamp = jiffies;

	desc->error = NFS_PROTO(inode)->readdir(file->f_path.dentry, cred, *desc->dir_cookie,

						page,

	status = NFS_PROTO(inode)->readdir(file->f_path.dentry, cred,

						*desc->dir_cookie, page,

						NFS_SERVER(inode)->dtsize,

						desc->plus);

	desc->page = page;

	desc->ptr = kmap(page);		/* matching kunmap in nfs_do_filldir */

	if (desc->error >= 0) {

	if (status >= 0) {

		desc->timestamp = timestamp;

		desc->timestamp_valid = 1;

		if ((status = dir_decode(desc)) == 0)