summaryrefslogtreecommitdiff
path: root/fs/ext3/super.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-06-30 02:21:41 +0400
committerTony Luck <tony.luck@intel.com>2005-06-30 02:21:41 +0400
commitd18bfacff20f08aecf01bb971b110ca108eef3c7 (patch)
tree255f862839c593c796e609328575b611e3f56cf3 /fs/ext3/super.c
parenta68db763af9b676590c3fe9ec3f17bf18015eb2f (diff)
parentfd782a4a99d2d3e818b9465c427b10f7f027d7da (diff)
downloadlinux-d18bfacff20f08aecf01bb971b110ca108eef3c7.tar.xz
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r--fs/ext3/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index b4b3e8a39131..a6d1779d7de4 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -944,7 +944,8 @@ clear_qf_name:
"for remount\n");
return 0;
}
- match_int(&args[0], &option);
+ if (match_int(&args[0], &option) != 0)
+ return 0;
*n_blocks_count = option;
break;
case Opt_nobh: