Skip to content

L
linux
Commit 7206852c authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files
Options

XFS: Fix the mount-cleanup for single-subvolume filesystems. 

Modid: 2.5.x-xfs:slinx:128192a
parent 1cb2d696
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 26 deletions
fs/xfs/xfs_vfsops.c
View file @ 7206852c
...@@ -221,8 +221,6 @@ xfs_start_flags( ...@@ -221,8 +221,6 @@ xfs_start_flags(
mp->m_swidth = ap->swidth; mp->m_swidth = ap->swidth;
} }
if ((mp->m_logdev_targp != NULL) &&
(mp->m_logdev_targp != mp->m_ddev_targp)) {
if (ap->logbufs != 0 && ap->logbufs != -1 && if (ap->logbufs != 0 && ap->logbufs != -1 &&
(ap->logbufs < XLOG_NUM_ICLOGS || (ap->logbufs < XLOG_NUM_ICLOGS ||
ap->logbufs > XLOG_MAX_ICLOGS)) { ap->logbufs > XLOG_MAX_ICLOGS)) {
...@@ -247,7 +245,6 @@ xfs_start_flags( ...@@ -247,7 +245,6 @@ xfs_start_flags(
mp->m_fsname_len = strlen(ap->fsname) + 1; mp->m_fsname_len = strlen(ap->fsname) + 1;
mp->m_fsname = kmem_alloc(mp->m_fsname_len, KM_SLEEP); mp->m_fsname = kmem_alloc(mp->m_fsname_len, KM_SLEEP);
strcpy(mp->m_fsname, ap->fsname); strcpy(mp->m_fsname, ap->fsname);
}
/* /*
* Pull in the 'wsync' and 'ino64' mount options before we do the real * Pull in the 'wsync' and 'ino64' mount options before we do the real
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7