Attachment 240321 Details for Bug 355141 – patch 5

[patch] patch 5

0015-BZ-355141-smbfs-readdir-vs-signal-fix.patch (text/plain), 1.40 KB, created by Jeff Layton on 2007-10-27 11:49:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-10-27 11:49:31 UTC

Size: 1.40 KB

patch

obsolete

>From c9c0f03eeb0e35b71609ad3160cadae731f33ee7 Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Sat, 27 Oct 2007 07:06:10 -0400
>Subject: [PATCH] BZ#355141: smbfs readdir vs signal fix
>
>An old patch designed to fix http://bugme.osdl.org/show_bug.cgi?id=4497,
>"getdents gives empty/random result upon signal".
>
>If smbfs's readdir() is interupted by a signal, smb_readdir() failed to
>noticed that and proceeded to treat the unread-into page as valid directory
>contents.  Fix that up by handling the -ERESTARTSYS.
>
>Thanks to Stian Skjelstad for reporting and testing.
>
>Cc: Stian Skjelstad <stian@nixia.no>
>Signed-off-by: Andrew Morton <akpm@osdl.org>
>Signed-off-by: Linus Torvalds <torvalds@osdl.org>
>---
> fs/smbfs/dir.c |    5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
>diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
>index 6bf7f6f..c9af38f 100644
>--- a/fs/smbfs/dir.c
>+++ b/fs/smbfs/dir.c
>@@ -209,6 +209,8 @@ init_cache:
> 	ctl.valid  = 1;
> read_really:
> 	result = server->ops->readdir(filp, dirent, filldir, &ctl);
>+	if (result == -ERESTARTSYS && page)
>+		ClearPageUptodate(page);
> 	if (ctl.idx == -1)
> 		goto invalid_cache;	/* retry */
> 	ctl.head.end = ctl.fpos - 1;
>@@ -217,7 +219,8 @@ finished:
> 	if (page) {
> 		cache->head = ctl.head;
> 		kunmap(page);
>-		SetPageUptodate(page);
>+		if (result != -ERESTARTSYS)
>+			SetPageUptodate(page);
> 		unlock_page(page);
> 		page_cache_release(page);
> 	}
>-- 
>1.5.2.1
>

Actions: View | Diff

Attachments on bug 355141: 240281 | 240291 | 240301 | 240311 | 240321 | 240331 | 240341 | 271431