From d36e1439c54dc4dc047e6367746501ae896aa474 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 22 Jun 2005 17:16:31 +0000 Subject: [PATCH] --- yaml --- r: 2806 b: refs/heads/master c: 80fec4c62e2cf544ac26e53f3e0d2f73df6820b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/locks.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b1a8345838b2..15eccc1a7e1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3da28eb1c6545fe73263a24eba0996217490e1eb +refs/heads/master: 80fec4c62e2cf544ac26e53f3e0d2f73df6820b9 diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c index 3fa6a7ce57a7..a0bc03495bd4 100644 --- a/trunk/fs/locks.c +++ b/trunk/fs/locks.c @@ -1548,6 +1548,8 @@ int fcntl_getlk(struct file *filp, struct flock __user *l) if (filp->f_op && filp->f_op->lock) { error = filp->f_op->lock(filp, F_GETLK, &file_lock); + if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private) + file_lock.fl_ops->fl_release_private(&file_lock); if (error < 0) goto out; else @@ -1690,6 +1692,8 @@ int fcntl_getlk64(struct file *filp, struct flock64 __user *l) if (filp->f_op && filp->f_op->lock) { error = filp->f_op->lock(filp, F_GETLK, &file_lock); + if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private) + file_lock.fl_ops->fl_release_private(&file_lock); if (error < 0) goto out; else @@ -1873,6 +1877,8 @@ void locks_remove_flock(struct file *filp) .fl_end = OFFSET_MAX, }; filp->f_op->flock(filp, F_SETLKW, &fl); + if (fl.fl_ops && fl.fl_ops->fl_release_private) + fl.fl_ops->fl_release_private(&fl); } lock_kernel();