leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jfs: Several bugs in jfs_freeze() and jfs_unfreeze()

Browse Source 
The mentioned functions do not pay attention to the error codes returned
by the functions updateSuper(), lmLogInit() and lmLogShutdown(). It brings
to system crash later when writing to log.

The patch adds corresponding code to check and return the error codes
and to print correct error messages in case of errors.

Found by Linux File System Verification project (linuxtesting.org).

Signed-off-by: Vahram Martirosyan <vahram.martirosyan@linuxtesting.org>
Reviewed-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
This commit is contained in:
Vahram Martirosyan 2013-05-24 13:57:12 +05:00 committed by Dave Kleikamp
parent 514e250f67
commit e9b3766719
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fs/jfs/super.c
View File

@ -611,11 +611,28 @@ static int jfs_freeze(struct super_block *sb)
{ {
struct jfs_sb_info *sbi = JFS_SBI(sb); struct jfs_sb_info *sbi = JFS_SBI(sb);
struct jfs_log *log = sbi->log; struct jfs_log *log = sbi->log;
int rc = 0;
if (!(sb->s_flags & MS_RDONLY)) { if (!(sb->s_flags & MS_RDONLY)) {
txQuiesce(sb); txQuiesce(sb);
lmLogShutdown(log); rc = lmLogShutdown(log);
updateSuper(sb, FM_CLEAN); if (rc) {
jfs_error(sb, "jfs_freeze: lmLogShutdown failed");
/* let operations fail rather than hang */
txResume(sb);
return rc;
}
rc = updateSuper(sb, FM_CLEAN);
if (rc) {
jfs_err("jfs_freeze: updateSuper failed\n");
/*
* Don't fail here. Everything succeeded except
* marking the superblock clean, so there's really
* no harm in leaving it frozen for now.
*/
}
} }
return 0; return 0;
} }
@ -627,13 +644,18 @@ static int jfs_unfreeze(struct super_block *sb)
int rc = 0; int rc = 0;
if (!(sb->s_flags & MS_RDONLY)) { if (!(sb->s_flags & MS_RDONLY)) {
updateSuper(sb, FM_MOUNT); rc = updateSuper(sb, FM_MOUNT);
if ((rc = lmLogInit(log))) if (rc) {
jfs_err("jfs_unlock failed with return code %d", rc); jfs_error(sb, "jfs_unfreeze: updateSuper failed");
else goto out;
txResume(sb); }
rc = lmLogInit(log);
if (rc)
jfs_error(sb, "jfs_unfreeze: lmLogInit failed");
out:
txResume(sb);
} }
return 0; return rc;
} }
static struct dentry *jfs_do_mount(struct file_system_type *fs_type, static struct dentry *jfs_do_mount(struct file_system_type *fs_type,