The patch titled
Subject: fs.h: add member argument descriptions to lock_manager_operations
has been removed from the -mm tree. Its filename was
fsh-add-member-argument-descriptions-to-lock_manager_operations.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: fs.h: add member argument descriptions to lock_manager_operations
Function pointer struct members without argument 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>
Acked-by: 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>
---
include/linux/fs.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN include/linux/fs.h~fsh-add-member-argument-descriptions-to-lock_manager_operations include/linux/fs.h
--- a/include/linux/fs.h~fsh-add-member-argument-descriptions-to-lock_manager_operations
+++ a/include/linux/fs.h
@@ -864,12 +864,12 @@ struct file_lock_operations {
};
struct lock_manager_operations {
- int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
- unsigned long (*lm_owner_key)(struct file_lock *);
- void (*lm_notify)(struct file_lock *); /* unblock callback */
- int (*lm_grant)(struct file_lock *, struct file_lock *, int);
- void (*lm_break)(struct file_lock *);
- int (*lm_change)(struct file_lock **, int);
+ int (*lm_compare_owner)(struct file_lock *fl1, struct file_lock *fl2);
+ unsigned long (*lm_owner_key)(struct file_lock *fl);
+ void (*lm_notify)(struct file_lock *fl); /* unblock callback */
+ int (*lm_grant)(struct file_lock *fl, struct file_lock *conf, int result);
+ void (*lm_break)(struct file_lock *fl);
+ int (*lm_change)(struct file_lock **fl, int type);
};
struct lock_manager {
_
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-plock-add-argument-descriptions-to-notify.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
