Commit 3cf9460a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] If you mount an XFS filesystem with no mount options at all, then
parents 57ce36fe 1bd960ee

fs/xfs/linux-2.6/xfs_super.c

+7 −7
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ xfs_parseargs( 
	char			*this_char, *value, *eov;

	int			dsunit, dswidth, vol_dsunit, vol_dswidth;

	int			iosize;

	int			ikeep = 0;

	int			dmapi_implies_ikeep = 1;



	args->flags |= XFSMNT_BARRIER;

	args->flags2 |= XFSMNT2_COMPAT_IOSIZE;
@@ -302,10 +302,10 @@ xfs_parseargs( 
		} else if (!strcmp(this_char, MNTOPT_NOBARRIER)) {

			args->flags &= ~XFSMNT_BARRIER;

		} else if (!strcmp(this_char, MNTOPT_IKEEP)) {

			ikeep = 1;

			args->flags &= ~XFSMNT_IDELETE;

			args->flags |= XFSMNT_IKEEP;

		} else if (!strcmp(this_char, MNTOPT_NOIKEEP)) {

			args->flags |= XFSMNT_IDELETE;

			dmapi_implies_ikeep = 0;

			args->flags &= ~XFSMNT_IKEEP;

		} else if (!strcmp(this_char, MNTOPT_LARGEIO)) {

			args->flags2 &= ~XFSMNT2_COMPAT_IOSIZE;

		} else if (!strcmp(this_char, MNTOPT_NOLARGEIO)) {
@@ -410,8 +410,8 @@ xfs_parseargs( 
	 * Note that if "ikeep" or "noikeep" mount options are

	 * supplied, then they are honored.

	 */

	if (!(args->flags & XFSMNT_DMAPI) && !ikeep)

		args->flags |= XFSMNT_IDELETE;

	if ((args->flags & XFSMNT_DMAPI) && dmapi_implies_ikeep)

		args->flags |= XFSMNT_IKEEP;



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

		if (dsunit) {
@@ -446,6 +446,7 @@ xfs_showargs( 
{

	static struct proc_xfs_info xfs_info_set[] = {

		/* the few simple ones we can get from the mount struct */

		{ XFS_MOUNT_IKEEP,		"," MNTOPT_IKEEP },

		{ XFS_MOUNT_WSYNC,		"," MNTOPT_WSYNC },

		{ XFS_MOUNT_INO64,		"," MNTOPT_INO64 },

		{ XFS_MOUNT_NOALIGN,		"," MNTOPT_NOALIGN },
@@ -461,7 +462,6 @@ xfs_showargs( 
	};

	static struct proc_xfs_info xfs_info_unset[] = {

		/* the few simple ones we can get from the mount struct */

		{ XFS_MOUNT_IDELETE,		"," MNTOPT_IKEEP },

		{ XFS_MOUNT_COMPAT_IOSIZE,	"," MNTOPT_LARGEIO },

		{ XFS_MOUNT_BARRIER,		"," MNTOPT_NOBARRIER },

		{ XFS_MOUNT_SMALL_INUMS,	"," MNTOPT_64BITINODE },

fs/xfs/xfs_clnt.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct xfs_mount_args { 
#define XFSMNT_NOUUID		0x01000000	/* Ignore fs uuid */

#define XFSMNT_DMAPI		0x02000000	/* enable dmapi/xdsm */

#define XFSMNT_BARRIER		0x04000000	/* use write barriers */

#define XFSMNT_IDELETE		0x08000000	/* inode cluster delete */

#define XFSMNT_IKEEP		0x08000000	/* inode cluster delete */

#define XFSMNT_SWALLOC		0x10000000	/* turn on stripe width

						 * allocation */

#define XFSMNT_DIRSYNC		0x40000000	/* sync creat,link,unlink,rename

fs/xfs/xfs_ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ xfs_difree( 
	/*

	 * When an inode cluster is free, it becomes eligible for removal

	 */

	if ((mp->m_flags & XFS_MOUNT_IDELETE) &&

	if (!(mp->m_flags & XFS_MOUNT_IKEEP) &&

	    (rec.ir_freecount == XFS_IALLOC_INODES(mp))) {



		*delete = 1;

fs/xfs/xfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ typedef struct xfs_mount { 
#define XFS_MOUNT_SMALL_INUMS	(1ULL << 15)	/* users wants 32bit inodes */

#define XFS_MOUNT_NOUUID	(1ULL << 16)	/* ignore uuid during mount */

#define XFS_MOUNT_BARRIER	(1ULL << 17)

#define XFS_MOUNT_IDELETE	(1ULL << 18)	/* delete empty inode clusters*/

#define XFS_MOUNT_IKEEP		(1ULL << 18)	/* keep empty inode clusters*/

#define XFS_MOUNT_SWALLOC	(1ULL << 19)	/* turn on stripe width

						 * allocation */

#define XFS_MOUNT_RDONLY	(1ULL << 20)	/* read-only fs */

fs/xfs/xfs_vfsops.c

+2 −2
Original line number Diff line number Diff line
@@ -281,8 +281,8 @@ xfs_start_flags( 
		mp->m_readio_log = mp->m_writeio_log = ap->iosizelog;

	}



	if (ap->flags & XFSMNT_IDELETE)

		mp->m_flags |= XFS_MOUNT_IDELETE;

	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)