Merge tag 'v3.16-rc1' into x86/cpufeature

[firefly-linux-kernel-4.4.55.git] / fs / nfsd / nfssvc.c

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 9a4a5f9e7468748f7195ac92f86d7317c83e0822..1879e43f2868c7ffbf21405f41412d2f540f19f7 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -591,12 +591,6 @@ nfsd(void *vrqstp)
        nfsdstats.th_cnt++;
        mutex_unlock(&nfsd_mutex);
 
-       /*
-        * We want less throttling in balance_dirty_pages() so that nfs to
-        * localhost doesn't cause nfsd to lock up due to all the client's
-        * dirty pages.
-        */
-       current->flags |= PF_LESS_THROTTLE;
        set_freezable();
 
        /*