projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NFS: Create an read_pageio_init() function
[deliverable/linux.git]
/
fs
/
file_table.c
diff --git
a/fs/file_table.c
b/fs/file_table.c
index 70f2a0fd6aec62b28724d46e356dc0ff871f88b8..a305d9e2d1b2aac05dcd456bdd23885652272439 100644
(file)
--- a/
fs/file_table.c
+++ b/
fs/file_table.c
@@
-34,7
+34,6
@@
struct files_stat_struct files_stat = {
.max_files = NR_FILE
};
.max_files = NR_FILE
};
-DECLARE_LGLOCK(files_lglock);
DEFINE_LGLOCK(files_lglock);
/* SLAB cache for file structures */
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)
{
*/
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);
__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)) {
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);
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:
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))
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. */
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;
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)
}
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();
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);
}
percpu_counter_init(&nr_files, 0);
}
This page took
0.02457 seconds
and
5
git commands to generate.