Attachment 297649 Details for Bug 435291 – experimental patch 2 -- have nfs_revalidate_mapping deal with errors from invalidate_inode_pages2

[patch] experimental patch 2 -- have nfs_revalidate_mapping deal with errors from invalidate_inode_pages2

0010-BZ-435291-NFS-handle-errors-from-invalidate_inode_.patch (text/plain), 1.32 KB, created by Jeff Layton on 2008-03-11 17:42:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-03-11 17:42:54 UTC

Size: 1.32 KB

patch

obsolete

>From 7bd98244be7e060ee52a2680e0a8361c3650d82e Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Tue, 11 Mar 2008 12:40:07 -0400
>Subject: [PATCH] BZ#435291: NFS: handle errors from invalidate_inode_pages2 in nfs_revalidate_mapping
>
>Currently, when nfs_revalidate_mapping() incurs an error in
>invalidate_inode_pages2, it blindly carries on as if it had succeeded.
>Have it check for and return an error when that occurs.
>---
> fs/nfs/inode.c |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>index 612fddd..9189b88 100644
>--- a/fs/nfs/inode.c
>+++ b/fs/nfs/inode.c
>@@ -696,7 +696,7 @@ int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
> int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
> {
> 	struct nfs_inode *nfsi = NFS_I(inode);
>-	int ret = 0;
>+	int ret = 0, err;
> 
> 	if (NFS_STALE(inode))
> 		ret = -ESTALE;
>@@ -708,7 +708,9 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
> 		nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);
> 		if (S_ISREG(inode->i_mode))
> 			nfs_sync_mapping(mapping);
>-		invalidate_inode_pages2(mapping);
>+		err = invalidate_inode_pages2(mapping);
>+		if (err != 0)
>+			return err;
> 
> 		spin_lock(&inode->i_lock);
> 		nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
>-- 
>1.5.3.6
>

Actions: View | Diff

Attachments on bug 435291: 296231 | 296232 | 297648 | 297649 | 298407 | 306161 | 309133