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

* '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

diff --cc fs/fuse/dev.c
index 6484eb75acd6f318c04238a51763b7cf2c9599ea,b152761c1bf60fbb33e8683df48abbdfdae8fe07..51d9e33d634f4fb40f28fc00276123e1dc8f13c0
--- 1/fs/fuse/dev.c
--- 2/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);

diff --cc fs/fuse/inode.c
Simple merge