locks: Remove unused conf argument from lm_grant

This argument is always NULL so don't pass it around.

[jlayton: remove dependencies on previous patches in series]

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Layton <jlayton@primarydata.com>

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index f704458ea5f59a78d8b1121508cc9f22acfe6e45..e0ab3a93eeff01b42ec4ffaeb48160bcd0fc9ad6 100644 (file)
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -30,7 +30,7 @@ struct plock_op {
 
 struct plock_xop {
        struct plock_op xop;
-       void *callback;
+       int (*callback)(struct file_lock *fl, int result);
        void *fl;
        void *file;
        struct file_lock flc;
@@ -190,7 +190,7 @@ static int dlm_plock_callback(struct plock_op *op)
        struct file *file;
        struct file_lock *fl;
        struct file_lock *flc;
-       int (*notify)(void *, void *, int) = NULL;
+       int (*notify)(struct file_lock *fl, int result) = NULL;
        struct plock_xop *xop = (struct plock_xop *)op;
        int rv = 0;
 
@@ -209,7 +209,7 @@ static int dlm_plock_callback(struct plock_op *op)
        notify = xop->callback;
 
        if (op->info.rv) {
-               notify(fl, NULL, op->info.rv);
+               notify(fl, op->info.rv);
                goto out;
        }
 
@@ -228,7 +228,7 @@ static int dlm_plock_callback(struct plock_op *op)
                          (unsigned long long)op->info.number, file, fl);
        }
 
-       rv = notify(fl, NULL, 0);
+       rv = notify(fl, 0);
        if (rv) {
                /* XXX: We need to cancel the fs lock here: */
                log_print("dlm_plock_callback: lock granted after lock request "

diff --cc fs/lockd/svclock.c
Simple merge

diff --cc include/linux/fs.h
Simple merge