From e7e39019aeecc889803f0f43018eb4bd9521b34f Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Fri, 6 Apr 2007 13:12:46 -0400 Subject: [PATCH] --- yaml --- r: 53509 b: refs/heads/master c: 91e59c368c6ba5eed0369a085c42c9f270b97aa8 h: refs/heads/master i: 53507: 04c4c94d156e8bb4f6a178b6a17c3a5c8857b2dc v: v3 --- [refs] | 2 +- trunk/fs/nfs/write.c | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/[refs] b/[refs] index 3699ad98593d..584c496caf9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a0ba9ae485c5fd17d0bff2f14d9dd75b8985593 +refs/heads/master: 91e59c368c6ba5eed0369a085c42c9f270b97aa8 diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 8593965a35ef..dbad89c8e427 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -594,34 +594,6 @@ static inline int nfs_scan_commit(struct inode *inode, struct list_head *dst, un } #endif -static int nfs_wait_on_write_congestion(struct address_space *mapping) -{ - struct inode *inode = mapping->host; - struct backing_dev_info *bdi = mapping->backing_dev_info; - int ret = 0; - - might_sleep(); - - if (!bdi_write_congested(bdi)) - return 0; - - nfs_inc_stats(inode, NFSIOS_CONGESTIONWAIT); - - do { - struct rpc_clnt *clnt = NFS_CLIENT(inode); - sigset_t oldset; - - rpc_clnt_sigmask(clnt, &oldset); - ret = congestion_wait_interruptible(WRITE, HZ/10); - rpc_clnt_sigunmask(clnt, &oldset); - if (ret == -ERESTARTSYS) - break; - ret = 0; - } while (bdi_write_congested(bdi)); - - return ret; -} - /* * Try to update any existing write request, or create one if there is none. * In order to match, the request's credentials must match those of @@ -640,8 +612,6 @@ static struct nfs_page * nfs_update_request(struct nfs_open_context* ctx, end = offset + bytes; - if (nfs_wait_on_write_congestion(mapping)) - return ERR_PTR(-ERESTARTSYS); for (;;) { /* Loop over all inode entries and see if we find * A request for the page we wish to update