Messages in this thread Patch in this message | | | From | Miklos Szeredi <> | Subject | [PATCH 4/4] vfs: fs_may_remount_ro: turn unnecessary check into a WARN_ON | Date | Wed, 24 Aug 2011 15:22:03 +0200 |
| |
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 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/file_table.c b/fs/file_table.c index c322794..dc9f437 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -486,8 +486,11 @@ int fs_may_remount_ro(struct super_block *sb) 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); -- 1.7.3.4
| |