diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-21 20:01:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:25 -0400 |
commit | 6aed62853c72e29f2c97bbac7712cb398e8c9437 (patch) | |
tree | 4362cfa98b6b588f84fb2241115b7ef5b5dfce55 | |
parent | 6e1d5dcc2bbbe71dbf010c747e15739bef6b7218 (diff) |
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>
-rw-r--r-- | fs/afs/flock.c | 2 | ||||
-rw-r--r-- | fs/lockd/clntproc.c | 2 | ||||
-rw-r--r-- | fs/nfs/nfs4state.c | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/fs/afs/flock.c b/fs/afs/flock.c index 3ff8bdd18fb3..0931bc1325eb 100644 --- a/fs/afs/flock.c +++ b/fs/afs/flock.c | |||
@@ -21,7 +21,7 @@ static void afs_fl_release_private(struct file_lock *fl); | |||
21 | static struct workqueue_struct *afs_lock_manager; | 21 | static struct workqueue_struct *afs_lock_manager; |
22 | static DEFINE_MUTEX(afs_lock_manager_mutex); | 22 | static DEFINE_MUTEX(afs_lock_manager_mutex); |
23 | 23 | ||
24 | static struct file_lock_operations afs_lock_ops = { | 24 | static const struct file_lock_operations afs_lock_ops = { |
25 | .fl_copy_lock = afs_fl_copy_lock, | 25 | .fl_copy_lock = afs_fl_copy_lock, |
26 | .fl_release_private = afs_fl_release_private, | 26 | .fl_release_private = afs_fl_release_private, |
27 | }; | 27 | }; |
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 4336adba952a..c81249fef11f 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c | |||
@@ -458,7 +458,7 @@ static void nlmclnt_locks_release_private(struct file_lock *fl) | |||
458 | nlm_put_lockowner(fl->fl_u.nfs_fl.owner); | 458 | nlm_put_lockowner(fl->fl_u.nfs_fl.owner); |
459 | } | 459 | } |
460 | 460 | ||
461 | static struct file_lock_operations nlmclnt_lock_ops = { | 461 | static const struct file_lock_operations nlmclnt_lock_ops = { |
462 | .fl_copy_lock = nlmclnt_locks_copy_lock, | 462 | .fl_copy_lock = nlmclnt_locks_copy_lock, |
463 | .fl_release_private = nlmclnt_locks_release_private, | 463 | .fl_release_private = nlmclnt_locks_release_private, |
464 | }; | 464 | }; |
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 1434080aefeb..2ef4fecf3984 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -638,7 +638,7 @@ static void nfs4_fl_release_lock(struct file_lock *fl) | |||
638 | nfs4_put_lock_state(fl->fl_u.nfs4_fl.owner); | 638 | nfs4_put_lock_state(fl->fl_u.nfs4_fl.owner); |
639 | } | 639 | } |
640 | 640 | ||
641 | static struct file_lock_operations nfs4_fl_lock_ops = { | 641 | static const struct file_lock_operations nfs4_fl_lock_ops = { |
642 | .fl_copy_lock = nfs4_fl_copy_lock, | 642 | .fl_copy_lock = nfs4_fl_copy_lock, |
643 | .fl_release_private = nfs4_fl_release_lock, | 643 | .fl_release_private = nfs4_fl_release_lock, |
644 | }; | 644 | }; |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 13c030ebfd28..6146dec21c35 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1066,7 +1066,7 @@ struct file_lock { | |||
1066 | struct fasync_struct * fl_fasync; /* for lease break notifications */ | 1066 | struct fasync_struct * fl_fasync; /* for lease break notifications */ |
1067 | unsigned long fl_break_time; /* for nonblocking lease breaks */ | 1067 | unsigned long fl_break_time; /* for nonblocking lease breaks */ |
1068 | 1068 | ||
1069 | struct file_lock_operations *fl_ops; /* Callbacks for filesystems */ | 1069 | const struct file_lock_operations *fl_ops; /* Callbacks for filesystems */ |
1070 | struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */ | 1070 | struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */ |
1071 | union { | 1071 | union { |
1072 | struct nfs_lock_info nfs_fl; | 1072 | struct nfs_lock_info nfs_fl; |