The patch titled
Subject: fs/dlm/plock.c: add argument descriptions to notify
has been removed from the -mm tree. Its filename was
dlm-plock-add-argument-descriptions-to-notify.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: fs/dlm/plock.c: add argument descriptions to notify
Function pointer arguments without type names
are not very clear. Add them.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: David Teigland <teigland@xxxxxxxxxx>
Cc: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
Cc: Christine Caulfield <ccaulfie@xxxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/dlm/plock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/dlm/plock.c~dlm-plock-add-argument-descriptions-to-notify fs/dlm/plock.c
--- a/fs/dlm/plock.c~dlm-plock-add-argument-descriptions-to-notify
+++ a/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 *, struct file_lock *, int);
void *fl;
void *file;
struct file_lock flc;
@@ -190,7 +190,7 @@ static int dlm_plock_callback(struct plo
struct file *file;
struct file_lock *fl;
struct file_lock *flc;
- int (*notify)(void *, void *, int) = NULL;
+ int (*notify)(struct file_lock *fl, struct file_lock *cont, int result) = NULL;
struct plock_xop *xop = (struct plock_xop *)op;
int rv = 0;
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
origin.patch
mm-utilc-add-kstrimdup.patch
fs-isofs-logging-clean-up.patch
linux-next.patch
dlm-fs-remove-unused-conf-from-lm_grant.patch
dlm-plock-reduce-indentation-by-rearranging-order.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
