forked from luck/tmp_suning_uos_patched
const: make file_lock_operations const
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6e1d5dcc2b
commit
6aed62853c
|
@ -21,7 +21,7 @@ static void afs_fl_release_private(struct file_lock *fl);
|
||||||
static struct workqueue_struct *afs_lock_manager;
|
static struct workqueue_struct *afs_lock_manager;
|
||||||
static DEFINE_MUTEX(afs_lock_manager_mutex);
|
static DEFINE_MUTEX(afs_lock_manager_mutex);
|
||||||
|
|
||||||
static struct file_lock_operations afs_lock_ops = {
|
static const struct file_lock_operations afs_lock_ops = {
|
||||||
.fl_copy_lock = afs_fl_copy_lock,
|
.fl_copy_lock = afs_fl_copy_lock,
|
||||||
.fl_release_private = afs_fl_release_private,
|
.fl_release_private = afs_fl_release_private,
|
||||||
};
|
};
|
||||||
|
|
|
@ -458,7 +458,7 @@ static void nlmclnt_locks_release_private(struct file_lock *fl)
|
||||||
nlm_put_lockowner(fl->fl_u.nfs_fl.owner);
|
nlm_put_lockowner(fl->fl_u.nfs_fl.owner);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct file_lock_operations nlmclnt_lock_ops = {
|
static const struct file_lock_operations nlmclnt_lock_ops = {
|
||||||
.fl_copy_lock = nlmclnt_locks_copy_lock,
|
.fl_copy_lock = nlmclnt_locks_copy_lock,
|
||||||
.fl_release_private = nlmclnt_locks_release_private,
|
.fl_release_private = nlmclnt_locks_release_private,
|
||||||
};
|
};
|
||||||
|
|
|
@ -638,7 +638,7 @@ static void nfs4_fl_release_lock(struct file_lock *fl)
|
||||||
nfs4_put_lock_state(fl->fl_u.nfs4_fl.owner);
|
nfs4_put_lock_state(fl->fl_u.nfs4_fl.owner);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct file_lock_operations nfs4_fl_lock_ops = {
|
static const struct file_lock_operations nfs4_fl_lock_ops = {
|
||||||
.fl_copy_lock = nfs4_fl_copy_lock,
|
.fl_copy_lock = nfs4_fl_copy_lock,
|
||||||
.fl_release_private = nfs4_fl_release_lock,
|
.fl_release_private = nfs4_fl_release_lock,
|
||||||
};
|
};
|
||||||
|
|
|
@ -1066,7 +1066,7 @@ struct file_lock {
|
||||||
struct fasync_struct * fl_fasync; /* for lease break notifications */
|
struct fasync_struct * fl_fasync; /* for lease break notifications */
|
||||||
unsigned long fl_break_time; /* for nonblocking lease breaks */
|
unsigned long fl_break_time; /* for nonblocking lease breaks */
|
||||||
|
|
||||||
struct file_lock_operations *fl_ops; /* Callbacks for filesystems */
|
const struct file_lock_operations *fl_ops; /* Callbacks for filesystems */
|
||||||
struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */
|
struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */
|
||||||
union {
|
union {
|
||||||
struct nfs_lock_info nfs_fl;
|
struct nfs_lock_info nfs_fl;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user