[Devel,RHEL7,COMMIT] fs/nfs: charge lock in nfds4_layout_setlease()

Submitted by Konstantin Khorenko on Nov. 14, 2016, 9:37 a.m.

Details

Message ID 201611140937.uAE9bC8U008566@finist_cl7.x64_64.work.ct
State New
Series "fs/nfs: charge lock in nfds4_layout_setlease()"
Headers show

Commit Message

Konstantin Khorenko Nov. 14, 2016, 9:37 a.m.
The commit is pushed to "branch-rh7-3.10.0-327.36.1.vz7.19.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.36.1.vz7.19.8
------>
commit 1cf1a6f2f2d98b65da135489c7e54c740aceb990
Author: Dmitry Safonov <dsafonov@virtuozzo.com>
Date:   Fri Nov 11 16:11:46 2016 +0400

    fs/nfs: charge lock in nfds4_layout_setlease()
    
    It's not from this rebase: accounting for nfsd lease also missed in
    previous vz kernel. I belive, it means that no one tried compilation
    with CONFIG_NFSD_PNFS, under which nfs4layouts.o is.
    
    To be merged into Initial patchset.
    
    Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
---
 fs/nfsd/nfs4layouts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 5acf598..16dd049 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -159,7 +159,7 @@  nfsd4_layout_setlease(struct nfs4_layout_stateid *ls)
 	struct file_lock *fl;
 	int status;
 
-	fl = locks_alloc_lock();
+	fl = locks_alloc_lock(1);
 	if (!fl)
 		return -ENOMEM;
 	locks_init_lock(fl);