diff options
| author | Tom Zanussi <zanussi@kernel.org> | 2019-05-21 15:31:59 -0500 |
|---|---|---|
| committer | Tom Zanussi <zanussi@kernel.org> | 2019-05-21 15:31:59 -0500 |
| commit | 7e4eec4a8da1e85c9baebdddf4a8af31d7653263 (patch) | |
| tree | e7c5db695e3a53509d4d85c9be7170cb0271b15e /fs/9p/v9fs.h | |
| parent | 32e860e0679fce1ccfa8395df41f8790e24172b6 (diff) | |
| parent | dc3e913edf94d54de5678e726cf95b38327e5d09 (diff) | |
| download | linux-rt-7e4eec4a8da1e85c9baebdddf4a8af31d7653263.tar.gz | |
Merge tag 'v3.18.139' into v3.18-rt-work
This is the 3.18.139 stable release
Diffstat (limited to 'fs/9p/v9fs.h')
| -rw-r--r-- | fs/9p/v9fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h index 099c7712631c..5e748e716b36 100644 --- a/fs/9p/v9fs.h +++ b/fs/9p/v9fs.h @@ -117,6 +117,7 @@ struct v9fs_session_info { struct list_head slist; /* list of sessions registered with v9fs */ struct backing_dev_info bdi; struct rw_semaphore rename_sem; + long session_lock_timeout; /* retry interval for blocking locks */ }; /* cache_validity flags */ |