summaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-01-07 18:45:36 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2016-01-07 18:45:36 -0500
commitdaaadd2283eb8bcae3b866592a9a1c807cc60605 (patch)
tree7abff6186295207d923f1e9225b9340087696070 /fs/nfs/write.c
parent210c7c1750fdf769647d1d526c9ea34c412c9eee (diff)
parent13331a551ab4df87f7a027d2cab392da96aba1de (diff)
downloadop-kernel-dev-daaadd2283eb8bcae3b866592a9a1c807cc60605.zip
op-kernel-dev-daaadd2283eb8bcae3b866592a9a1c807cc60605.tar.gz
Merge branch 'bugfixes'
* bugfixes: SUNRPC: Fixup socket wait for memory SUNRPC: Fix a missing break in rpc_anyaddr() pNFS/flexfiles: Fix an Oopsable typo in ff_mirror_match_fh() NFS: Fix attribute cache revalidation NFS: Ensure we revalidate attributes before using execute_ok() NFS: Flush reclaim writes using FLUSH_COND_STABLE NFS: Background flush should not be low priority NFSv4.1/pnfs: Fixup an lo->plh_block_lgets imbalance in layoutreturn NFSv4: Don't perform cached access checks before we've OPENed the file NFS: Allow the combination pNFS and labeled NFS NFS42: handle layoutstats stateid error nfs: Fix race in __update_open_stateid() nfs: fix missing assignment in nfs4_sequence_done tracepoint
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 8ba4f71..ce43cd6 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -246,11 +246,9 @@ static int wb_priority(struct writeback_control *wbc)
{
int ret = 0;
if (wbc->for_reclaim)
- return FLUSH_HIGHPRI | FLUSH_STABLE;
+ return FLUSH_HIGHPRI | FLUSH_COND_STABLE;
if (wbc->sync_mode == WB_SYNC_ALL)
ret = FLUSH_COND_STABLE;
- if (wbc->for_kupdate || wbc->for_background)
- ret |= FLUSH_LOWPRI;
return ret;
}
OpenPOWER on IntegriCloud