diff --git a/[refs] b/[refs] index ee38a8058910..a14a605b3d4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e6045f134784f4b158b3c0f7a282b04bd816887 +refs/heads/master: cfdaf9e5f95993264b5aee7cbb9dd16977bc11ed diff --git a/trunk/fs/file_table.c b/trunk/fs/file_table.c index 3176fefc92e1..664e3f2309b8 100644 --- a/trunk/fs/file_table.c +++ b/trunk/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? */