Messages in this thread Patch in this message | | | Date | Tue, 18 Jan 2011 13:32:37 +0100 | From | Miklos Szeredi <> | Subject | [PATCH v4 4/4] vfs: fs_may_remount_ro: turn unnecessary check into a WARN_ON |
| |
From: Miklos Szeredi <mszeredi@suse.cz>
Now a successful sb_prepare_remount_readonly() should ensure that no writable files remain for this superblock. So turn this check into a WARN_ON.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> --- fs/file_table.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Index: linux-2.6/fs/file_table.c =================================================================== --- linux-2.6.orig/fs/file_table.c 2011-01-18 09:01:20.000000000 +0100 +++ linux-2.6/fs/file_table.c 2011-01-18 12:39:21.000000000 +0100 @@ -436,8 +436,11 @@ int fs_may_remount_ro(struct super_block if (inode->i_nlink == 0) goto too_bad; - /* Writeable file? */ - if (S_ISREG(inode->i_mode) && (file->f_mode & FMODE_WRITE)) + /* + * Writable file? + * Should be caught by sb_prepare_remount_readonly(). + */ + if (WARN_ON(S_ISREG(inode->i_mode) && (file->f_mode & FMODE_WRITE))) goto too_bad; } while_file_list_for_each_entry; lg_global_unlock(files_lglock); --
| |