Commit f8f15e42 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Niv Sardi
Browse files

[XFS] merge xfs_mount into xfs_fs_fill_super 



xfs_mount is already pretty linux-specific so merge it into
xfs_fs_fill_super to allow for a more structured mount code in the next
patches. xfs_start_flags and xfs_finish_flags also move to xfs_super.c.

SGI-PV: 981951
SGI-Modid: xfs-linux-melb:xfs-kern:31189a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent e48ad316

fs/xfs/linux-2.6/xfs_super.c

+355 −5
Original line number Diff line number Diff line
@@ -1366,6 +1366,235 @@ xfs_fs_setxquota( 
				   Q_XSETPQLIM), id, (caddr_t)fdq);

}



/*

 * This function fills in xfs_mount_t fields based on mount args.

 * Note: the superblock has _not_ yet been read in.

 */

STATIC int

xfs_start_flags(

	struct xfs_mount_args	*ap,

	struct xfs_mount	*mp)

{

	/* Values are in BBs */

	if ((ap->flags & XFSMNT_NOALIGN) != XFSMNT_NOALIGN) {

		/*

		 * At this point the superblock has not been read

		 * in, therefore we do not know the block size.

		 * Before the mount call ends we will convert

		 * these to FSBs.

		 */

		mp->m_dalign = ap->sunit;

		mp->m_swidth = ap->swidth;

	}



	if (ap->logbufs != -1 &&

	    ap->logbufs != 0 &&

	    (ap->logbufs < XLOG_MIN_ICLOGS ||

	     ap->logbufs > XLOG_MAX_ICLOGS)) {

		cmn_err(CE_WARN,

			"XFS: invalid logbufs value: %d [not %d-%d]",

			ap->logbufs, XLOG_MIN_ICLOGS, XLOG_MAX_ICLOGS);

		return XFS_ERROR(EINVAL);

	}

	mp->m_logbufs = ap->logbufs;

	if (ap->logbufsize != -1 &&

	    ap->logbufsize !=  0 &&

	    (ap->logbufsize < XLOG_MIN_RECORD_BSIZE ||

	     ap->logbufsize > XLOG_MAX_RECORD_BSIZE ||

	     !is_power_of_2(ap->logbufsize))) {

		cmn_err(CE_WARN,

	"XFS: invalid logbufsize: %d [not 16k,32k,64k,128k or 256k]",

			ap->logbufsize);

		return XFS_ERROR(EINVAL);

	}

	mp->m_logbsize = ap->logbufsize;

	mp->m_fsname_len = strlen(ap->fsname) + 1;

	mp->m_fsname = kmem_alloc(mp->m_fsname_len, KM_SLEEP);

	strcpy(mp->m_fsname, ap->fsname);

	if (ap->rtname[0]) {

		mp->m_rtname = kmem_alloc(strlen(ap->rtname) + 1, KM_SLEEP);

		strcpy(mp->m_rtname, ap->rtname);

	}

	if (ap->logname[0]) {

		mp->m_logname = kmem_alloc(strlen(ap->logname) + 1, KM_SLEEP);

		strcpy(mp->m_logname, ap->logname);

	}



	if (ap->flags & XFSMNT_WSYNC)

		mp->m_flags |= XFS_MOUNT_WSYNC;

#if XFS_BIG_INUMS

	if (ap->flags & XFSMNT_INO64) {

		mp->m_flags |= XFS_MOUNT_INO64;

		mp->m_inoadd = XFS_INO64_OFFSET;

	}

#endif

	if (ap->flags & XFSMNT_RETERR)

		mp->m_flags |= XFS_MOUNT_RETERR;

	if (ap->flags & XFSMNT_NOALIGN)

		mp->m_flags |= XFS_MOUNT_NOALIGN;

	if (ap->flags & XFSMNT_SWALLOC)

		mp->m_flags |= XFS_MOUNT_SWALLOC;

	if (ap->flags & XFSMNT_OSYNCISOSYNC)

		mp->m_flags |= XFS_MOUNT_OSYNCISOSYNC;

	if (ap->flags & XFSMNT_32BITINODES)

		mp->m_flags |= XFS_MOUNT_32BITINODES;



	if (ap->flags & XFSMNT_IOSIZE) {

		if (ap->iosizelog > XFS_MAX_IO_LOG ||

		    ap->iosizelog < XFS_MIN_IO_LOG) {

			cmn_err(CE_WARN,

		"XFS: invalid log iosize: %d [not %d-%d]",

				ap->iosizelog, XFS_MIN_IO_LOG,

				XFS_MAX_IO_LOG);

			return XFS_ERROR(EINVAL);

		}



		mp->m_flags |= XFS_MOUNT_DFLT_IOSIZE;

		mp->m_readio_log = mp->m_writeio_log = ap->iosizelog;

	}



	if (ap->flags & XFSMNT_IKEEP)

		mp->m_flags |= XFS_MOUNT_IKEEP;

	if (ap->flags & XFSMNT_DIRSYNC)

		mp->m_flags |= XFS_MOUNT_DIRSYNC;

	if (ap->flags & XFSMNT_ATTR2)

		mp->m_flags |= XFS_MOUNT_ATTR2;

	if (ap->flags & XFSMNT_NOATTR2)

		mp->m_flags |= XFS_MOUNT_NOATTR2;



	if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)

		mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;



	/*

	 * no recovery flag requires a read-only mount

	 */

	if (ap->flags & XFSMNT_NORECOVERY) {

		if (!(mp->m_flags & XFS_MOUNT_RDONLY)) {

			cmn_err(CE_WARN,

	"XFS: tried to mount a FS read-write without recovery!");

			return XFS_ERROR(EINVAL);

		}

		mp->m_flags |= XFS_MOUNT_NORECOVERY;

	}



	if (ap->flags & XFSMNT_NOUUID)

		mp->m_flags |= XFS_MOUNT_NOUUID;

	if (ap->flags & XFSMNT_BARRIER)

		mp->m_flags |= XFS_MOUNT_BARRIER;

	else

		mp->m_flags &= ~XFS_MOUNT_BARRIER;



	if (ap->flags2 & XFSMNT2_FILESTREAMS)

		mp->m_flags |= XFS_MOUNT_FILESTREAMS;



	if (ap->flags & XFSMNT_DMAPI)

		mp->m_flags |= XFS_MOUNT_DMAPI;

	return 0;

}



/*

 * This function fills in xfs_mount_t fields based on mount args.

 * Note: the superblock _has_ now been read in.

 */

STATIC int

xfs_finish_flags(

	struct xfs_mount_args	*ap,

	struct xfs_mount	*mp)

{

	int			ronly = (mp->m_flags & XFS_MOUNT_RDONLY);



	/* Fail a mount where the logbuf is smaller then the log stripe */

	if (xfs_sb_version_haslogv2(&mp->m_sb)) {

		if ((ap->logbufsize <= 0) &&

		    (mp->m_sb.sb_logsunit > XLOG_BIG_RECORD_BSIZE)) {

			mp->m_logbsize = mp->m_sb.sb_logsunit;

		} else if (ap->logbufsize > 0 &&

			   ap->logbufsize < mp->m_sb.sb_logsunit) {

			cmn_err(CE_WARN,

	"XFS: logbuf size must be greater than or equal to log stripe size");

			return XFS_ERROR(EINVAL);

		}

	} else {

		/* Fail a mount if the logbuf is larger than 32K */

		if (ap->logbufsize > XLOG_BIG_RECORD_BSIZE) {

			cmn_err(CE_WARN,

	"XFS: logbuf size for version 1 logs must be 16K or 32K");

			return XFS_ERROR(EINVAL);

		}

	}



	/*

	 * mkfs'ed attr2 will turn on attr2 mount unless explicitly

	 * told by noattr2 to turn it off

	 */

	if (xfs_sb_version_hasattr2(&mp->m_sb) &&

	    !(ap->flags & XFSMNT_NOATTR2))

		mp->m_flags |= XFS_MOUNT_ATTR2;



	/*

	 * prohibit r/w mounts of read-only filesystems

	 */

	if ((mp->m_sb.sb_flags & XFS_SBF_READONLY) && !ronly) {

		cmn_err(CE_WARN,

	"XFS: cannot mount a read-only filesystem as read-write");

		return XFS_ERROR(EROFS);

	}



	/*

	 * check for shared mount.

	 */

	if (ap->flags & XFSMNT_SHARED) {

		if (!xfs_sb_version_hasshared(&mp->m_sb))

			return XFS_ERROR(EINVAL);



		/*

		 * For IRIX 6.5, shared mounts must have the shared

		 * version bit set, have the persistent readonly

		 * field set, must be version 0 and can only be mounted

		 * read-only.

		 */

		if (!ronly || !(mp->m_sb.sb_flags & XFS_SBF_READONLY) ||

		     (mp->m_sb.sb_shared_vn != 0))

			return XFS_ERROR(EINVAL);



		mp->m_flags |= XFS_MOUNT_SHARED;



		/*

		 * Shared XFS V0 can't deal with DMI.  Return EINVAL.

		 */

		if (mp->m_sb.sb_shared_vn == 0 && (ap->flags & XFSMNT_DMAPI))

			return XFS_ERROR(EINVAL);

	}



	if (ap->flags & XFSMNT_UQUOTA) {

		mp->m_qflags |= (XFS_UQUOTA_ACCT | XFS_UQUOTA_ACTIVE);

		if (ap->flags & XFSMNT_UQUOTAENF)

			mp->m_qflags |= XFS_UQUOTA_ENFD;

	}



	if (ap->flags & XFSMNT_GQUOTA) {

		mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE);

		if (ap->flags & XFSMNT_GQUOTAENF)

			mp->m_qflags |= XFS_OQUOTA_ENFD;

	} else if (ap->flags & XFSMNT_PQUOTA) {

		mp->m_qflags |= (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE);

		if (ap->flags & XFSMNT_PQUOTAENF)

			mp->m_qflags |= XFS_OQUOTA_ENFD;

	}



	return 0;

}



/*

 * The file system configurations are:

 *	(1) device (partition) with data and internal log

 *	(2) logical volume with data and log subvolumes.

 *	(3) logical volume with data, log, and realtime subvolumes.

 *

 * We only have to handle opening the log and realtime volumes here if

 * they are present.  The data subvolume has already been opened by

 * get_sb_bdev() and is stored in vfsp->vfs_super->s_bdev.

 */

STATIC int

xfs_fs_fill_super(

	struct super_block	*sb,
@@ -1375,7 +1604,9 @@ xfs_fs_fill_super( 
	struct inode		*root;

	struct xfs_mount	*mp = NULL;

	struct xfs_mount_args	*args = xfs_args_allocate(sb, silent);

	int			error;

	struct block_device	*ddev = sb->s_bdev;

	struct block_device	*logdev = NULL, *rtdev = NULL;

	int			flags = 0, error;



	mp = xfs_mount_init();
@@ -1398,9 +1629,113 @@ xfs_fs_fill_super( 
	sb->s_qcop = &xfs_quotactl_operations;

	sb->s_op = &xfs_super_operations;



	error = xfs_mount(mp, args, NULL);

	error = xfs_dmops_get(mp, args);

	if (error)

		goto fail_vfsop;

	error = xfs_qmops_get(mp, args);

	if (error)

		goto fail_vfsop;



	if (args->flags & XFSMNT_QUIET)

		flags |= XFS_MFSI_QUIET;



	/*

	 * Open real time and log devices - order is important.

	 */

	if (args->logname[0]) {

		error = xfs_blkdev_get(mp, args->logname, &logdev);

		if (error)

			goto fail_vfsop;

	}

	if (args->rtname[0]) {

		error = xfs_blkdev_get(mp, args->rtname, &rtdev);

		if (error) {

			xfs_blkdev_put(logdev);

			goto fail_vfsop;

		}



		if (rtdev == ddev || rtdev == logdev) {

			cmn_err(CE_WARN,

	"XFS: Cannot mount filesystem with identical rtdev and ddev/logdev.");

			xfs_blkdev_put(logdev);

			xfs_blkdev_put(rtdev);

			error = EINVAL;

			goto fail_vfsop;

		}

	}



	/*

	 * Setup xfs_mount buffer target pointers

	 */

	error = ENOMEM;

	mp->m_ddev_targp = xfs_alloc_buftarg(ddev, 0);

	if (!mp->m_ddev_targp) {

		xfs_blkdev_put(logdev);

		xfs_blkdev_put(rtdev);

		goto fail_vfsop;

	}

	if (rtdev) {

		mp->m_rtdev_targp = xfs_alloc_buftarg(rtdev, 1);

		if (!mp->m_rtdev_targp) {

			xfs_blkdev_put(logdev);

			xfs_blkdev_put(rtdev);

			goto error0;

		}

	}

	mp->m_logdev_targp = (logdev && logdev != ddev) ?

				xfs_alloc_buftarg(logdev, 1) : mp->m_ddev_targp;

	if (!mp->m_logdev_targp) {

		xfs_blkdev_put(logdev);

		xfs_blkdev_put(rtdev);

		goto error0;

	}



	/*

	 * Setup flags based on mount(2) options and then the superblock

	 */

	error = xfs_start_flags(args, mp);

	if (error)

		goto error1;

	error = xfs_readsb(mp, flags);

	if (error)

		goto error1;

	error = xfs_finish_flags(args, mp);

	if (error)

		goto error2;



	/*

	 * Setup xfs_mount buffer target pointers based on superblock

	 */

	error = xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_blocksize,

				    mp->m_sb.sb_sectsize);

	if (!error && logdev && logdev != ddev) {

		unsigned int	log_sector_size = BBSIZE;



		if (xfs_sb_version_hassector(&mp->m_sb))

			log_sector_size = mp->m_sb.sb_logsectsize;

		error = xfs_setsize_buftarg(mp->m_logdev_targp,

					    mp->m_sb.sb_blocksize,

					    log_sector_size);

	}

	if (!error && rtdev)

		error = xfs_setsize_buftarg(mp->m_rtdev_targp,

					    mp->m_sb.sb_blocksize,

					    mp->m_sb.sb_sectsize);

	if (error)

		goto error2;



	if (mp->m_flags & XFS_MOUNT_BARRIER)

		xfs_mountfs_check_barriers(mp);



	error = xfs_filestream_mount(mp);

	if (error)

		goto error2;



	error = xfs_mountfs(mp, flags);

	if (error)

		goto error2;



	XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, args->mtpt, args->fsname);



	sb->s_dirt = 1;

	sb->s_magic = XFS_SB_MAGIC;
@@ -1438,6 +1773,21 @@ xfs_fs_fill_super( 
	kmem_free(args);

	return 0;



 error2:

	if (mp->m_sb_bp)

		xfs_freesb(mp);

 error1:

	xfs_binval(mp->m_ddev_targp);

	if (logdev && logdev != ddev)

		xfs_binval(mp->m_logdev_targp);

	if (rtdev)

		xfs_binval(mp->m_rtdev_targp);

 error0:

	xfs_unmountfs_close(mp, NULL);

	xfs_qmops_put(mp);

	xfs_dmops_put(mp);

	goto fail_vfsop;



 fail_vnrele:

	if (sb->s_root) {

		dput(sb->s_root);

fs/xfs/xfs_vfsops.c

+0 −369
Original line number Diff line number Diff line
@@ -189,375 +189,6 @@ xfs_cleanup(void) 
	kmem_zone_destroy(xfs_log_ticket_zone);

}



/*

 * xfs_start_flags

 *

 * This function fills in xfs_mount_t fields based on mount args.

 * Note: the superblock has _not_ yet been read in.

 */

STATIC int

xfs_start_flags(

	struct xfs_mount_args	*ap,

	struct xfs_mount	*mp)

{

	/* Values are in BBs */

	if ((ap->flags & XFSMNT_NOALIGN) != XFSMNT_NOALIGN) {

		/*

		 * At this point the superblock has not been read

		 * in, therefore we do not know the block size.

		 * Before the mount call ends we will convert

		 * these to FSBs.

		 */

		mp->m_dalign = ap->sunit;

		mp->m_swidth = ap->swidth;

	}



	if (ap->logbufs != -1 &&

	    ap->logbufs != 0 &&

	    (ap->logbufs < XLOG_MIN_ICLOGS ||

	     ap->logbufs > XLOG_MAX_ICLOGS)) {

		cmn_err(CE_WARN,

			"XFS: invalid logbufs value: %d [not %d-%d]",

			ap->logbufs, XLOG_MIN_ICLOGS, XLOG_MAX_ICLOGS);

		return XFS_ERROR(EINVAL);

	}

	mp->m_logbufs = ap->logbufs;

	if (ap->logbufsize != -1 &&

	    ap->logbufsize !=  0 &&

	    (ap->logbufsize < XLOG_MIN_RECORD_BSIZE ||

	     ap->logbufsize > XLOG_MAX_RECORD_BSIZE ||

	     !is_power_of_2(ap->logbufsize))) {

		cmn_err(CE_WARN,

	"XFS: invalid logbufsize: %d [not 16k,32k,64k,128k or 256k]",

			ap->logbufsize);

		return XFS_ERROR(EINVAL);

	}

	mp->m_logbsize = ap->logbufsize;

	mp->m_fsname_len = strlen(ap->fsname) + 1;

	mp->m_fsname = kmem_alloc(mp->m_fsname_len, KM_SLEEP);

	strcpy(mp->m_fsname, ap->fsname);

	if (ap->rtname[0]) {

		mp->m_rtname = kmem_alloc(strlen(ap->rtname) + 1, KM_SLEEP);

		strcpy(mp->m_rtname, ap->rtname);

	}

	if (ap->logname[0]) {

		mp->m_logname = kmem_alloc(strlen(ap->logname) + 1, KM_SLEEP);

		strcpy(mp->m_logname, ap->logname);

	}



	if (ap->flags & XFSMNT_WSYNC)

		mp->m_flags |= XFS_MOUNT_WSYNC;

#if XFS_BIG_INUMS

	if (ap->flags & XFSMNT_INO64) {

		mp->m_flags |= XFS_MOUNT_INO64;

		mp->m_inoadd = XFS_INO64_OFFSET;

	}

#endif

	if (ap->flags & XFSMNT_RETERR)

		mp->m_flags |= XFS_MOUNT_RETERR;

	if (ap->flags & XFSMNT_NOALIGN)

		mp->m_flags |= XFS_MOUNT_NOALIGN;

	if (ap->flags & XFSMNT_SWALLOC)

		mp->m_flags |= XFS_MOUNT_SWALLOC;

	if (ap->flags & XFSMNT_OSYNCISOSYNC)

		mp->m_flags |= XFS_MOUNT_OSYNCISOSYNC;

	if (ap->flags & XFSMNT_32BITINODES)

		mp->m_flags |= XFS_MOUNT_32BITINODES;



	if (ap->flags & XFSMNT_IOSIZE) {

		if (ap->iosizelog > XFS_MAX_IO_LOG ||

		    ap->iosizelog < XFS_MIN_IO_LOG) {

			cmn_err(CE_WARN,

		"XFS: invalid log iosize: %d [not %d-%d]",

				ap->iosizelog, XFS_MIN_IO_LOG,

				XFS_MAX_IO_LOG);

			return XFS_ERROR(EINVAL);

		}



		mp->m_flags |= XFS_MOUNT_DFLT_IOSIZE;

		mp->m_readio_log = mp->m_writeio_log = ap->iosizelog;

	}



	if (ap->flags & XFSMNT_IKEEP)

		mp->m_flags |= XFS_MOUNT_IKEEP;

	if (ap->flags & XFSMNT_DIRSYNC)

		mp->m_flags |= XFS_MOUNT_DIRSYNC;

	if (ap->flags & XFSMNT_ATTR2)

		mp->m_flags |= XFS_MOUNT_ATTR2;

	if (ap->flags & XFSMNT_NOATTR2)

		mp->m_flags |= XFS_MOUNT_NOATTR2;



	if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)

		mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;



	/*

	 * no recovery flag requires a read-only mount

	 */

	if (ap->flags & XFSMNT_NORECOVERY) {

		if (!(mp->m_flags & XFS_MOUNT_RDONLY)) {

			cmn_err(CE_WARN,

	"XFS: tried to mount a FS read-write without recovery!");

			return XFS_ERROR(EINVAL);

		}

		mp->m_flags |= XFS_MOUNT_NORECOVERY;

	}



	if (ap->flags & XFSMNT_NOUUID)

		mp->m_flags |= XFS_MOUNT_NOUUID;

	if (ap->flags & XFSMNT_BARRIER)

		mp->m_flags |= XFS_MOUNT_BARRIER;

	else

		mp->m_flags &= ~XFS_MOUNT_BARRIER;



	if (ap->flags2 & XFSMNT2_FILESTREAMS)

		mp->m_flags |= XFS_MOUNT_FILESTREAMS;



	if (ap->flags & XFSMNT_DMAPI)

		mp->m_flags |= XFS_MOUNT_DMAPI;

	return 0;

}



/*

 * This function fills in xfs_mount_t fields based on mount args.

 * Note: the superblock _has_ now been read in.

 */

STATIC int

xfs_finish_flags(

	struct xfs_mount_args	*ap,

	struct xfs_mount	*mp)

{

	int			ronly = (mp->m_flags & XFS_MOUNT_RDONLY);



	/* Fail a mount where the logbuf is smaller then the log stripe */

	if (xfs_sb_version_haslogv2(&mp->m_sb)) {

		if ((ap->logbufsize <= 0) &&

		    (mp->m_sb.sb_logsunit > XLOG_BIG_RECORD_BSIZE)) {

			mp->m_logbsize = mp->m_sb.sb_logsunit;

		} else if (ap->logbufsize > 0 &&

			   ap->logbufsize < mp->m_sb.sb_logsunit) {

			cmn_err(CE_WARN,

	"XFS: logbuf size must be greater than or equal to log stripe size");

			return XFS_ERROR(EINVAL);

		}

	} else {

		/* Fail a mount if the logbuf is larger than 32K */

		if (ap->logbufsize > XLOG_BIG_RECORD_BSIZE) {

			cmn_err(CE_WARN,

	"XFS: logbuf size for version 1 logs must be 16K or 32K");

			return XFS_ERROR(EINVAL);

		}

	}



	/*

	 * mkfs'ed attr2 will turn on attr2 mount unless explicitly

	 * told by noattr2 to turn it off

	 */

	if (xfs_sb_version_hasattr2(&mp->m_sb) &&

	    !(ap->flags & XFSMNT_NOATTR2))

		mp->m_flags |= XFS_MOUNT_ATTR2;



	/*

	 * prohibit r/w mounts of read-only filesystems

	 */

	if ((mp->m_sb.sb_flags & XFS_SBF_READONLY) && !ronly) {

		cmn_err(CE_WARN,

	"XFS: cannot mount a read-only filesystem as read-write");

		return XFS_ERROR(EROFS);

	}



	/*

	 * check for shared mount.

	 */

	if (ap->flags & XFSMNT_SHARED) {

		if (!xfs_sb_version_hasshared(&mp->m_sb))

			return XFS_ERROR(EINVAL);



		/*

		 * For IRIX 6.5, shared mounts must have the shared

		 * version bit set, have the persistent readonly

		 * field set, must be version 0 and can only be mounted

		 * read-only.

		 */

		if (!ronly || !(mp->m_sb.sb_flags & XFS_SBF_READONLY) ||

		     (mp->m_sb.sb_shared_vn != 0))

			return XFS_ERROR(EINVAL);



		mp->m_flags |= XFS_MOUNT_SHARED;



		/*

		 * Shared XFS V0 can't deal with DMI.  Return EINVAL.

		 */

		if (mp->m_sb.sb_shared_vn == 0 && (ap->flags & XFSMNT_DMAPI))

			return XFS_ERROR(EINVAL);

	}



	if (ap->flags & XFSMNT_UQUOTA) {

		mp->m_qflags |= (XFS_UQUOTA_ACCT | XFS_UQUOTA_ACTIVE);

		if (ap->flags & XFSMNT_UQUOTAENF)

			mp->m_qflags |= XFS_UQUOTA_ENFD;

	}



	if (ap->flags & XFSMNT_GQUOTA) {

		mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE);

		if (ap->flags & XFSMNT_GQUOTAENF)

			mp->m_qflags |= XFS_OQUOTA_ENFD;

	} else if (ap->flags & XFSMNT_PQUOTA) {

		mp->m_qflags |= (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE);

		if (ap->flags & XFSMNT_PQUOTAENF)

			mp->m_qflags |= XFS_OQUOTA_ENFD;

	}



	return 0;

}



/*

 * xfs_mount

 *

 * The file system configurations are:

 *	(1) device (partition) with data and internal log

 *	(2) logical volume with data and log subvolumes.

 *	(3) logical volume with data, log, and realtime subvolumes.

 *

 * We only have to handle opening the log and realtime volumes here if

 * they are present.  The data subvolume has already been opened by

 * get_sb_bdev() and is stored in vfsp->vfs_super->s_bdev.

 */

int

xfs_mount(

	struct xfs_mount	*mp,

	struct xfs_mount_args	*args,

	cred_t			*credp)

{

	struct block_device	*ddev, *logdev, *rtdev;

	int			flags = 0, error;



	ddev = mp->m_super->s_bdev;

	logdev = rtdev = NULL;



	error = xfs_dmops_get(mp, args);

	if (error)

		return error;

	error = xfs_qmops_get(mp, args);

	if (error)

		return error;



	if (args->flags & XFSMNT_QUIET)

		flags |= XFS_MFSI_QUIET;



	/*

	 * Open real time and log devices - order is important.

	 */

	if (args->logname[0]) {

		error = xfs_blkdev_get(mp, args->logname, &logdev);

		if (error)

			return error;

	}

	if (args->rtname[0]) {

		error = xfs_blkdev_get(mp, args->rtname, &rtdev);

		if (error) {

			xfs_blkdev_put(logdev);

			return error;

		}



		if (rtdev == ddev || rtdev == logdev) {

			cmn_err(CE_WARN,

	"XFS: Cannot mount filesystem with identical rtdev and ddev/logdev.");

			xfs_blkdev_put(logdev);

			xfs_blkdev_put(rtdev);

			return EINVAL;

		}

	}



	/*

	 * Setup xfs_mount buffer target pointers

	 */

	error = ENOMEM;

	mp->m_ddev_targp = xfs_alloc_buftarg(ddev, 0);

	if (!mp->m_ddev_targp) {

		xfs_blkdev_put(logdev);

		xfs_blkdev_put(rtdev);

		return error;

	}

	if (rtdev) {

		mp->m_rtdev_targp = xfs_alloc_buftarg(rtdev, 1);

		if (!mp->m_rtdev_targp) {

			xfs_blkdev_put(logdev);

			xfs_blkdev_put(rtdev);

			goto error0;

		}

	}

	mp->m_logdev_targp = (logdev && logdev != ddev) ?

				xfs_alloc_buftarg(logdev, 1) : mp->m_ddev_targp;

	if (!mp->m_logdev_targp) {

		xfs_blkdev_put(logdev);

		xfs_blkdev_put(rtdev);

		goto error0;

	}



	/*

	 * Setup flags based on mount(2) options and then the superblock

	 */

	error = xfs_start_flags(args, mp);

	if (error)

		goto error1;

	error = xfs_readsb(mp, flags);

	if (error)

		goto error1;

	error = xfs_finish_flags(args, mp);

	if (error)

		goto error2;



	/*

	 * Setup xfs_mount buffer target pointers based on superblock

	 */

	error = xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_blocksize,

				    mp->m_sb.sb_sectsize);

	if (!error && logdev && logdev != ddev) {

		unsigned int	log_sector_size = BBSIZE;



		if (xfs_sb_version_hassector(&mp->m_sb))

			log_sector_size = mp->m_sb.sb_logsectsize;

		error = xfs_setsize_buftarg(mp->m_logdev_targp,

					    mp->m_sb.sb_blocksize,

					    log_sector_size);

	}

	if (!error && rtdev)

		error = xfs_setsize_buftarg(mp->m_rtdev_targp,

					    mp->m_sb.sb_blocksize,

					    mp->m_sb.sb_sectsize);

	if (error)

		goto error2;



	if (mp->m_flags & XFS_MOUNT_BARRIER)

		xfs_mountfs_check_barriers(mp);



	if ((error = xfs_filestream_mount(mp)))

		goto error2;



	error = xfs_mountfs(mp, flags);

	if (error)

		goto error2;



	XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, args->mtpt, args->fsname);



	return 0;



error2:

	if (mp->m_sb_bp)

		xfs_freesb(mp);

error1:

	xfs_binval(mp->m_ddev_targp);

	if (logdev && logdev != ddev)

		xfs_binval(mp->m_logdev_targp);

	if (rtdev)

		xfs_binval(mp->m_rtdev_targp);

error0:

	xfs_unmountfs_close(mp, credp);

	xfs_qmops_put(mp);

	xfs_dmops_put(mp);

	return error;

}



STATIC void

xfs_quiesce_fs(

	xfs_mount_t		*mp)

fs/xfs/xfs_vfsops.h

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ struct kstatfs; 
struct xfs_mount;

struct xfs_mount_args;



int xfs_mount(struct xfs_mount *mp, struct xfs_mount_args *args,

		struct cred *credp);

int xfs_sync(struct xfs_mount *mp, int flags);

void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname,

		int lnnum);

CRA Git | Maintained and supported by SUSTech CRA and CCSE