From 392e5d5955ed368b20712728641ffd7ee46304ed Mon Sep 17 00:00:00 2001 From: Jason Uhlenkott Date: Thu, 26 Apr 2007 17:25:51 -0700 Subject: [PATCH] --- yaml --- r: 53533 b: refs/heads/master c: a19b89cad51b6f0da8f4bafdfdcfb10264cbcdea h: refs/heads/master i: 53531: 06a0b22b28fdff9a04e723a00f4cd62d4d553e8e v: v3 --- [refs] | 2 +- trunk/fs/nfs/pagelist.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 194f3305a0e2..7a24489d37e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61322b30139b79ec77170723a3a80043dcc94e87 +refs/heads/master: a19b89cad51b6f0da8f4bafdfdcfb10264cbcdea diff --git a/trunk/fs/nfs/pagelist.c b/trunk/fs/nfs/pagelist.c index d846d39a31ef..fe90130bd7a9 100644 --- a/trunk/fs/nfs/pagelist.c +++ b/trunk/fs/nfs/pagelist.c @@ -51,9 +51,7 @@ nfs_page_free(struct nfs_page *p) * @count: number of bytes to read/write * * The page must be locked by the caller. This makes sure we never - * create two different requests for the same page, and avoids - * a possible deadlock when we reach the hard limit on the number - * of dirty pages. + * create two different requests for the same page. * User should ensure it is safe to sleep in this function. */ struct nfs_page * @@ -64,16 +62,12 @@ nfs_create_request(struct nfs_open_context *ctx, struct inode *inode, struct nfs_server *server = NFS_SERVER(inode); struct nfs_page *req; - /* Deal with hard limits. */ for (;;) { /* try to allocate the request struct */ req = nfs_page_alloc(); if (req != NULL) break; - /* Try to free up at least one request in order to stay - * below the hard limit - */ if (signalled() && (server->flags & NFS_MOUNT_INTR)) return ERR_PTR(-ERESTARTSYS); yield();