diff options
| author | Mark Brown <broonie@kernel.org> | 2018-04-16 12:44:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-04-16 12:44:57 +0100 |
| commit | d1480f9b535fa3901b7f303959bc196b304472a9 (patch) | |
| tree | fa2f494d5802977910af2511c3b2ece00f3badd9 /fs/cifs/file.c | |
| parent | 36e3dd72fb0d2c32f1ba1313d4da22fbb27b5bd4 (diff) | |
| parent | cc0eb4dd504b8a0adab865a9488297aca63013ba (diff) | |
Merge tag 'v4.9.94' into linux-linaro-lsk-v4.9
This is the 4.9.94 stable release
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 02e403af9518..49eeed25f200 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -589,7 +589,7 @@ cifs_relock_file(struct cifsFileInfo *cfile) struct cifs_tcon *tcon = tlink_tcon(cfile->tlink); int rc = 0; - down_read(&cinode->lock_sem); + down_read_nested(&cinode->lock_sem, SINGLE_DEPTH_NESTING); if (cinode->can_cache_brlcks) { /* can cache locks - no need to relock */ up_read(&cinode->lock_sem); |