1 files changed, 8 insertions, 9 deletions

diff --git a/fs/file_table.c b/fs/file_table.c
index 70f2a0fd6aec..a305d9e2d1b2 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -34,7 +34,6 @@ struct files_stat_struct files_stat = {
         .max_files = NR_FILE
 };
 
-DECLARE_LGLOCK(files_lglock);
 DEFINE_LGLOCK(files_lglock);
 
 /* SLAB cache for file structures */
@@ -421,9 +420,9 @@ static inline void __file_sb_list_add(struct file *file, struct super_block *sb)
  */
 void file_sb_list_add(struct file *file, struct super_block *sb)
 {
-        lg_local_lock(files_lglock);
+        lg_local_lock(&files_lglock);
         __file_sb_list_add(file, sb);
-        lg_local_unlock(files_lglock);
+        lg_local_unlock(&files_lglock);
 }
 
 /**
@@ -436,9 +435,9 @@ void file_sb_list_add(struct file *file, struct super_block *sb)
 void file_sb_list_del(struct file *file)
 {
         if (!list_empty(&file->f_u.fu_list)) {
-                lg_local_lock_cpu(files_lglock, file_list_cpu(file));
+                lg_local_lock_cpu(&files_lglock, file_list_cpu(file));
                 list_del_init(&file->f_u.fu_list);
-                lg_local_unlock_cpu(files_lglock, file_list_cpu(file));
+                lg_local_unlock_cpu(&files_lglock, file_list_cpu(file));
         }
 }
 
@@ -485,7 +484,7 @@ void mark_files_ro(struct super_block *sb)
         struct file *f;
 
 retry:
-        lg_global_lock(files_lglock);
+        lg_global_lock(&files_lglock);
         do_file_list_for_each_entry(sb, f) {
                 struct vfsmount *mnt;
                 if (!S_ISREG(f->f_path.dentry->d_inode->i_mode))
@@ -502,12 +501,12 @@ retry:
                 file_release_write(f);
                 mnt = mntget(f->f_path.mnt);
                 /* This can sleep, so we can't hold the spinlock. */
-                lg_global_unlock(files_lglock);
+                lg_global_unlock(&files_lglock);
                 mnt_drop_write(mnt);
                 mntput(mnt);
                 goto retry;
         } while_file_list_for_each_entry;
-        lg_global_unlock(files_lglock);
+        lg_global_unlock(&files_lglock);
 }
 
 void __init files_init(unsigned long mempages)
@@ -525,6 +524,6 @@ void __init files_init(unsigned long mempages)
         n = (mempages * (PAGE_SIZE / 1024)) / 10;
         files_stat.max_files = max_t(unsigned long, n, NR_FILE);
         files_defer_init();
-        lg_lock_init(files_lglock);
+        lg_lock_init(&files_lglock, "files_lglock");
         percpu_counter_init(&nr_files, 0);
 }