diff options
| author | Joel Becker <joel.becker@oracle.com> | 2009-10-28 22:28:24 -0700 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-10-28 22:28:24 -0700 |
| commit | fb5cbe9efd741b16e72133613747f76490bbecd3 (patch) | |
| tree | 014ef905e4c4ff708ad7dbceef445a2e0e567757 /fs | |
| parent | 964fe080d94db82a3268443e9b9ece4c60246414 (diff) | |
| download | talos-op-linux-fb5cbe9efd741b16e72133613747f76490bbecd3.tar.gz talos-op-linux-fb5cbe9efd741b16e72133613747f76490bbecd3.zip | |
ocfs2: Return -EINVAL when a device is not ocfs2.
In case of non-modular kernels the root filesystem is mounted by trying
several filesystems. If ocfs2 was tried before the actual filesystem
type, the mount would fail because ocfs2_sb_probe() returns -EAGAIN
instead of -EINVAL. ocfs2 will now return -EINVAL properly.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Reported-by: Laszlo Attila Toth <panther@balabit.hu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/super.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index c0e48aeebb1c..960673004df1 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -773,18 +773,20 @@ static int ocfs2_sb_probe(struct super_block *sb, if (tmpstat < 0) { status = tmpstat; mlog_errno(status); - goto bail; + break; } di = (struct ocfs2_dinode *) (*bh)->b_data; memset(stats, 0, sizeof(struct ocfs2_blockcheck_stats)); spin_lock_init(&stats->b_lock); - status = ocfs2_verify_volume(di, *bh, blksize, stats); - if (status >= 0) - goto bail; - brelse(*bh); - *bh = NULL; - if (status != -EAGAIN) + tmpstat = ocfs2_verify_volume(di, *bh, blksize, stats); + if (tmpstat < 0) { + brelse(*bh); + *bh = NULL; + } + if (tmpstat != -EAGAIN) { + status = tmpstat; break; + } } bail: |
