From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Sep 2009 16:23:03 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Tag: v2.6.32-rc1~642
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=9eead2a8115d2a6aecf267c292f751f7761fa5f8;p=net-next-2.6.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: add fusectl interface to max_background
  fuse: limit user-specified values of max background requests
  fuse: use drop_nlink() instead of direct nlink manipulation
  fuse: document protocol version negotiation
  fuse: make the number of max background requests and congestion threshold tunable
---

9eead2a8115d2a6aecf267c292f751f7761fa5f8
diff --cc fs/fuse/dev.c
index 6484eb75acd,b152761c1bf..51d9e33d634
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@@ -284,10 -284,10 +284,10 @@@ __releases(&fc->lock
  			fc->blocked = 0;
  			wake_up_all(&fc->blocked_waitq);
  		}
- 		if (fc->num_background == FUSE_CONGESTION_THRESHOLD &&
+ 		if (fc->num_background == fc->congestion_threshold &&
  		    fc->connected && fc->bdi_initialized) {
 -			clear_bdi_congested(&fc->bdi, READ);
 -			clear_bdi_congested(&fc->bdi, WRITE);
 +			clear_bdi_congested(&fc->bdi, BLK_RW_SYNC);
 +			clear_bdi_congested(&fc->bdi, BLK_RW_ASYNC);
  		}
  		fc->num_background--;
  		fc->active_background--;
@@@ -410,12 -410,12 +410,12 @@@ static void fuse_request_send_nowait_lo
  {
  	req->background = 1;
  	fc->num_background++;
- 	if (fc->num_background == FUSE_MAX_BACKGROUND)
+ 	if (fc->num_background == fc->max_background)
  		fc->blocked = 1;
- 	if (fc->num_background == FUSE_CONGESTION_THRESHOLD &&
+ 	if (fc->num_background == fc->congestion_threshold &&
  	    fc->bdi_initialized) {
 -		set_bdi_congested(&fc->bdi, READ);
 -		set_bdi_congested(&fc->bdi, WRITE);
 +		set_bdi_congested(&fc->bdi, BLK_RW_SYNC);
 +		set_bdi_congested(&fc->bdi, BLK_RW_ASYNC);
  	}
  	list_add_tail(&req->list, &fc->bg_queue);
  	flush_bg_queue(fc);