Merge /spare/repo/linux-2.6/

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/locks.c b/fs/locks.c
index 3fa6a7ce57a7..a0bc03495bd4 100644
--- a/fs/locks.c
+++ b/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();