Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b021967 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

const: make lock_manager_operations const 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6aed6285

fs/lockd/svclock.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static int nlmsvc_same_owner(struct file_lock *fl1, struct file_lock *fl2) 
	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,

fs/locks.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static int lease_mylease_callback(struct file_lock *fl, struct file_lock *try) 
	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,

fs/nfsd/nfs4state.c

+2 −2
Original line number Diff line number Diff line
@@ -2163,7 +2163,7 @@ int nfsd_change_deleg_cb(struct file_lock **onlist, int arg) 
		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,
@@ -3368,7 +3368,7 @@ nfs4_transform_lock_offset(struct file_lock *lock) 


/* 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

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -1067,7 +1067,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;

include/linux/lockd/lockd.h

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static inline int nlm_compare_locks(const struct file_lock *fl1, 
	     &&(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__ */