diff options
| author | Joel Fernandes <joelaf@google.com> | 2016-10-20 10:34:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-11 19:30:11 +0300 |
| commit | fc7e1a12dd5936544a1bf0f3b5e60e3087865b44 (patch) | |
| tree | 857df1344b8444f388a6e3ab5c55cd96fda62fc5 /fs/pstore/ram.c | |
| parent | a0a8e4197bfe5810a61b262f0c57426e43d60feb (diff) | |
| download | linux-fc7e1a12dd5936544a1bf0f3b5e60e3087865b44.tar.xz | |
pstore: Allow prz to control need for locking
commit 663deb47880f2283809669563c5a52ac7c6aef1a upstream.
In preparation of not locking at all for certain buffers depending on if
there's contention, make locking optional depending on the initialization
of the prz.
Signed-off-by: Joel Fernandes <joelaf@google.com>
[kees: moved locking flag into prz instead of via caller arguments]
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pstore/ram.c')
| -rw-r--r-- | fs/pstore/ram.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 5fa34243b1ae..eaca4cf4cf61 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -365,7 +365,7 @@ static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt, cxt->przs[i] = persistent_ram_new(*paddr, sz, 0, &cxt->ecc_info, - cxt->memtype); + cxt->memtype, 0); if (IS_ERR(cxt->przs[i])) { err = PTR_ERR(cxt->przs[i]); dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n", @@ -395,7 +395,8 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt, return -ENOMEM; } - *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info, cxt->memtype); + *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info, + cxt->memtype, 0); if (IS_ERR(*prz)) { int err = PTR_ERR(*prz); |