diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-07-08 12:04:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-07-08 12:04:41 -0400 |
| commit | 552a031ba12a4236be107a5b082a399237758a5d (patch) | |
| tree | a2bcdeb651b360013dbb654bbcd61dbaf51e0331 /fs/nfs/flexfilelayout/flexfilelayoutdev.c | |
| parent | f584dd32edc5d4400d7ceb92111a89f0c1f6651f (diff) | |
| parent | 0ecfebd2b52404ae0c54a878c872bb93363ada36 (diff) | |
Merge tag 'v5.2' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/flexfilelayout/flexfilelayoutdev.c')
| -rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index a809989807d6..19f856f45689 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #define NFSDBG_FACILITY NFSDBG_PNFS_LD | 19 | #define NFSDBG_FACILITY NFSDBG_PNFS_LD |
| 20 | 20 | ||
| 21 | static unsigned int dataserver_timeo = NFS_DEF_TCP_RETRANS; | 21 | static unsigned int dataserver_timeo = NFS_DEF_TCP_TIMEO; |
| 22 | static unsigned int dataserver_retrans; | 22 | static unsigned int dataserver_retrans; |
| 23 | 23 | ||
| 24 | static bool ff_layout_has_available_ds(struct pnfs_layout_segment *lseg); | 24 | static bool ff_layout_has_available_ds(struct pnfs_layout_segment *lseg); |