Merge branch 'linus' into x86/urgent

[~andy/linux] / fs / afs / flock.c

diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index 3ff8bdd18fb3b90de6829780d65b3d4bc3cbeb51..0931bc1325ebd26fe38b9b6cd515d82d6d3fc618 100644 (file)
--- a/fs/afs/flock.c
+++ b/fs/afs/flock.c
@@ -21,7 +21,7 @@ static void afs_fl_release_private(struct file_lock *fl);
 static struct workqueue_struct *afs_lock_manager;
 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_release_private     = afs_fl_release_private,
 };