Attachment 298051 Details for Bug 437479 – patch -- remove error field from nfs_readdir_descriptor_t

[patch] patch -- remove error field from nfs_readdir_descriptor_t

0001-BZ-437479-NFS-remove-error-field-from-nfs_readdir_.patch (text/plain), 1.58 KB, created by Jeff Layton on 2008-03-14 14:13:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-03-14 14:13:42 UTC

Size: 1.58 KB

patch

obsolete

>From 150db3654d7e171f7b6b3a4479e40db79ce0c1d8 Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Tue, 15 Jan 2008 12:33:15 -0500
>Subject: [PATCH] BZ#437479: 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 to use an existing local variable.
>---
> fs/nfs/dir.c |    8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
>index b0b3d8a..16a4323 100644
>--- a/fs/nfs/dir.c
>+++ b/fs/nfs/dir.c
>@@ -152,7 +152,6 @@ typedef struct {
> 	struct nfs_entry *entry;
> 	decode_dirent_t	decode;
> 	int		plus;
>-	int		error;
> } nfs_readdir_descriptor_t;
> 
> /* Now we cache directories properly, by stuffing the dirent
>@@ -205,7 +204,6 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
> 	return 0;
>  error:
> 	unlock_page(page);
>-	desc->error = error;
> 	return -EIO;
> }
> 
>@@ -470,13 +468,13 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
> 		status = -ENOMEM;
> 		goto out;
> 	}
>-	desc->error = NFS_PROTO(inode)->readdir(file->f_dentry, cred, *desc->dir_cookie,
>-						page,
>+	status = NFS_PROTO(inode)->readdir(file->f_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) {
> 		if ((status = dir_decode(desc)) == 0)
> 			desc->entry->prev_cookie = *desc->dir_cookie;
> 	} else
>-- 
>1.5.3.6
>

Actions: View | Diff

Attachments on bug 437479: 298051