The patch titled const: make lock_manager_operations const has been added to the -mm tree. Its filename is const-make-lock_manager_operations-const.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: const: make lock_manager_operations const From: Alexey Dobriyan <adobriyan@xxxxxxxxx> Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/lockd/svclock.c | 2 +- fs/locks.c | 2 +- fs/nfsd/nfs4state.c | 4 ++-- include/linux/fs.h | 2 +- include/linux/lockd/lockd.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff -puN fs/lockd/svclock.c~const-make-lock_manager_operations-const fs/lockd/svclock.c --- a/fs/lockd/svclock.c~const-make-lock_manager_operations-const +++ a/fs/lockd/svclock.c @@ -705,7 +705,7 @@ static int nlmsvc_same_owner(struct file return fl1->fl_owner == fl2->fl_owner && fl1->fl_pid == fl2->fl_pid; } -struct lock_manager_operations nlmsvc_lock_operations = { +const struct lock_manager_operations nlmsvc_lock_operations = { .fl_compare_owner = nlmsvc_same_owner, .fl_notify = nlmsvc_notify_blocked, .fl_grant = nlmsvc_grant_deferred, diff -puN fs/locks.c~const-make-lock_manager_operations-const fs/locks.c --- a/fs/locks.c~const-make-lock_manager_operations-const +++ a/fs/locks.c @@ -434,7 +434,7 @@ static int lease_mylease_callback(struct return fl->fl_file == try->fl_file; } -static struct lock_manager_operations lease_manager_ops = { +static const struct lock_manager_operations lease_manager_ops = { .fl_break = lease_break_callback, .fl_release_private = lease_release_private_callback, .fl_mylease = lease_mylease_callback, diff -puN fs/nfsd/nfs4state.c~const-make-lock_manager_operations-const fs/nfsd/nfs4state.c --- a/fs/nfsd/nfs4state.c~const-make-lock_manager_operations-const +++ a/fs/nfsd/nfs4state.c @@ -2095,7 +2095,7 @@ int nfsd_change_deleg_cb(struct file_loc return -EAGAIN; } -static struct lock_manager_operations nfsd_lease_mng_ops = { +static const struct lock_manager_operations nfsd_lease_mng_ops = { .fl_break = nfsd_break_deleg_cb, .fl_release_private = nfsd_release_deleg_cb, .fl_copy_lock = nfsd_copy_lock_deleg_cb, @@ -3300,7 +3300,7 @@ nfs4_transform_lock_offset(struct file_l /* Hack!: For now, we're defining this just so we can use a pointer to it * as a unique cookie to identify our (NFSv4's) posix locks. */ -static struct lock_manager_operations nfsd_posix_mng_ops = { +static const struct lock_manager_operations nfsd_posix_mng_ops = { }; static inline void diff -puN include/linux/fs.h~const-make-lock_manager_operations-const include/linux/fs.h --- a/include/linux/fs.h~const-make-lock_manager_operations-const +++ a/include/linux/fs.h @@ -1069,7 +1069,7 @@ struct file_lock { unsigned long fl_break_time; /* for nonblocking lease breaks */ const struct file_lock_operations *fl_ops; /* Callbacks for filesystems */ - struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */ + const struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */ union { struct nfs_lock_info nfs_fl; struct nfs4_lock_info nfs4_fl; diff -puN include/linux/lockd/lockd.h~const-make-lock_manager_operations-const include/linux/lockd/lockd.h --- a/include/linux/lockd/lockd.h~const-make-lock_manager_operations-const +++ a/include/linux/lockd/lockd.h @@ -352,7 +352,7 @@ static inline int nlm_compare_locks(cons &&(fl1->fl_type == fl2->fl_type || fl2->fl_type == F_UNLCK); } -extern struct lock_manager_operations nlmsvc_lock_operations; +extern const struct lock_manager_operations nlmsvc_lock_operations; #endif /* __KERNEL__ */ _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are linux-next.patch acpi-switch-proc-acpi-debug_layerdebug_level-to-seq_file.patch pcmcia-switch-proc-bus-pccard-drivers-to-seq_file.patch genirq-switch-proc-irq-spurious-to-seq_file.patch kernel-profilec-switch-proc-irq-prof_cpu_mask-to-seq_file.patch cpqarray-switch-to-seq_file.patch dac960-switch-to-seq_file.patch const-make-struct-super_block-dq_op-const.patch const-make-struct-super_block-s_qcop-const.patch const-mark-remaining-super_operations-const.patch const-mark-remaining-export_operations-const.patch const-mark-remaining-address_space_operations-const.patch const-mark-remaining-inode_operations-as-const.patch const-make-file_lock_operations-const.patch const-make-lock_manager_operations-const.patch const-make-block_device_operations-const.patch oom-move-oom_killer_enable-oom_killer_disable-to-where-they-belong.patch scripts-get_maintainerpl-add-remove-duplicates.patch proc_flush_task-flush-proc-tid-task-pid-when-a-sub-thread-exits.patch procfs-provide-stack-information-for-threads-v08.patch procfs-provide-stack-information-for-threads-v011.patch procfs-provide-stack-information-for-threads-v011-fix.patch viafb-switch-to-seq_file.patch reiserfs-remove-proc-fs-reiserfs-version.patch reiserfs-dont-compile-procfso-at-all-if-no-support.patch sysctl-remove-struct-file-argument-of-proc_handler.patch aio-ifdef-fields-in-mm_struct.patch gru-use-proc_create.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