Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[cascardo/linux.git] / fs / file_table.c

diff --git a/fs/file_table.c b/fs/file_table.c
index 3176fef..664e3f2 100644 (file)
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -323,12 +323,11 @@ void file_kill(struct file *file)
 
 int fs_may_remount_ro(struct super_block *sb)
 {
-       struct list_head *p;
+       struct file *file;
 
        /* Check that no files are currently opened for writing. */
        file_list_lock();
-       list_for_each(p, &sb->s_files) {
-               struct file *file = list_entry(p, struct file, f_u.fu_list);
+       list_for_each_entry(file, &sb->s_files, f_u.fu_list) {
                struct inode *inode = file->f_path.dentry->d_inode;
 
                /* File with pending delete? */