Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a19d9f88 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: kill ino64 mount option 



The ino64 mount option adds a fixed offset to 32bit inode numbers
to bring them into the 64bit range.  There's no need for this kind
of debug tool given that it's easy to produce real 64bit inode numbers
for testing.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
parent a0b0b8a5

fs/xfs/linux-2.6/xfs_iops.c

+0 −3
Original line number Diff line number Diff line
@@ -541,9 +541,6 @@ xfs_vn_getattr( 
	stat->uid = ip->i_d.di_uid;

	stat->gid = ip->i_d.di_gid;

	stat->ino = ip->i_ino;

#if XFS_BIG_INUMS

	stat->ino += mp->m_inoadd;

#endif

	stat->atime = inode->i_atime;

	stat->mtime.tv_sec = ip->i_d.di_mtime.t_sec;

	stat->mtime.tv_nsec = ip->i_d.di_mtime.t_nsec;

fs/xfs/linux-2.6/xfs_super.c

+3 −21
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ mempool_t *xfs_ioend_pool; 
#define MNTOPT_RTDEV	"rtdev"		/* realtime I/O device */

#define MNTOPT_BIOSIZE	"biosize"	/* log2 of preferred buffered io size */

#define MNTOPT_WSYNC	"wsync"		/* safe-mode nfs compatible mount */

#define MNTOPT_INO64	"ino64"		/* force inodes into 64-bit range */

#define MNTOPT_NOALIGN	"noalign"	/* turn off stripe alignment */

#define MNTOPT_SWALLOC	"swalloc"	/* turn on stripe width allocation */

#define MNTOPT_SUNIT	"sunit"		/* data volume stripe unit */
@@ -290,16 +289,6 @@ xfs_parseargs( 
			mp->m_flags |= XFS_MOUNT_OSYNCISOSYNC;

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

			mp->m_flags |= XFS_MOUNT_NORECOVERY;

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

#if XFS_BIG_INUMS

			mp->m_flags |= XFS_MOUNT_INO64;

			mp->m_inoadd = XFS_INO64_OFFSET;

#else

			cmn_err(CE_WARN,

				"XFS: %s option not allowed on this system",

				this_char);

			return EINVAL;

#endif

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

			mp->m_flags |= XFS_MOUNT_NOALIGN;

		} else if (!strcmp(this_char, MNTOPT_SWALLOC)) {
@@ -528,7 +517,6 @@ xfs_showargs( 
		/* 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 },

		{ XFS_MOUNT_SWALLOC,		"," MNTOPT_SWALLOC },

		{ XFS_MOUNT_NOUUID,		"," MNTOPT_NOUUID },
@@ -1199,15 +1187,9 @@ xfs_fs_statfs( 
	statp->f_bfree = statp->f_bavail =

				sbp->sb_fdblocks - XFS_ALLOC_SET_ASIDE(mp);

	fakeinos = statp->f_bfree << sbp->sb_inopblog;

#if XFS_BIG_INUMS

	fakeinos += mp->m_inoadd;

#endif

	statp->f_files =

	    MIN(sbp->sb_icount + fakeinos, (__uint64_t)XFS_MAXINUMBER);

	if (mp->m_maxicount)

#if XFS_BIG_INUMS

		if (!mp->m_inoadd)

#endif

		statp->f_files = min_t(typeof(statp->f_files),

					statp->f_files,

					mp->m_maxicount);

fs/xfs/xfs_dir2_block.c

+1 −6
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ xfs_dir2_block_getdents( 
	xfs_mount_t		*mp;		/* filesystem mount point */

	char			*ptr;		/* current data entry */

	int			wantoff;	/* starting block offset */

	xfs_ino_t		ino;

	xfs_off_t		cook;



	mp = dp->i_mount;
@@ -509,16 +508,12 @@ xfs_dir2_block_getdents( 


		cook = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,

					    (char *)dep - (char *)block);

		ino = be64_to_cpu(dep->inumber);

#if XFS_BIG_INUMS

		ino += mp->m_inoadd;

#endif



		/*

		 * If it didn't fit, set the final offset to here & return.

		 */

		if (filldir(dirent, dep->name, dep->namelen, cook & 0x7fffffff,

			    ino, DT_UNKNOWN)) {

			    be64_to_cpu(dep->inumber), DT_UNKNOWN)) {

			*offset = cook & 0x7fffffff;

			xfs_da_brelse(NULL, bp);

			return 0;

fs/xfs/xfs_dir2_leaf.c

+1 −14
Original line number Diff line number Diff line
@@ -780,7 +780,6 @@ xfs_dir2_leaf_getdents( 
	int			ra_index;	/* *map index for read-ahead */

	int			ra_offset;	/* map entry offset for ra */

	int			ra_want;	/* readahead count wanted */

	xfs_ino_t		ino;



	/*

	 * If the offset is at or past the largest allowed value,
@@ -1076,24 +1075,12 @@ xfs_dir2_leaf_getdents( 
			continue;

		}



		/*

		 * Copy the entry into the putargs, and try formatting it.

		 */

		dep = (xfs_dir2_data_entry_t *)ptr;



		length = xfs_dir2_data_entsize(dep->namelen);



		ino = be64_to_cpu(dep->inumber);

#if XFS_BIG_INUMS

		ino += mp->m_inoadd;

#endif



		/*

		 * Won't fit.  Return to caller.

		 */

		if (filldir(dirent, dep->name, dep->namelen,

			    xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff,

			    ino, DT_UNKNOWN))

			    be64_to_cpu(dep->inumber), DT_UNKNOWN))

			break;



		/*

fs/xfs/xfs_dir2_sf.c

+1 −12
Original line number Diff line number Diff line
@@ -748,11 +748,7 @@ xfs_dir2_sf_getdents( 
	 * Put . entry unless we're starting past it.

	 */

	if (*offset <= dot_offset) {

		ino = dp->i_ino;

#if XFS_BIG_INUMS

		ino += mp->m_inoadd;

#endif

		if (filldir(dirent, ".", 1, dot_offset & 0x7fffffff, ino, DT_DIR)) {

		if (filldir(dirent, ".", 1, dot_offset & 0x7fffffff, dp->i_ino, DT_DIR)) {

			*offset = dot_offset & 0x7fffffff;

			return 0;

		}
@@ -763,9 +759,6 @@ xfs_dir2_sf_getdents( 
	 */

	if (*offset <= dotdot_offset) {

		ino = xfs_dir2_sf_get_inumber(sfp, &sfp->hdr.parent);

#if XFS_BIG_INUMS

		ino += mp->m_inoadd;

#endif

		if (filldir(dirent, "..", 2, dotdot_offset & 0x7fffffff, ino, DT_DIR)) {

			*offset = dotdot_offset & 0x7fffffff;

			return 0;
@@ -786,10 +779,6 @@ xfs_dir2_sf_getdents( 
		}



		ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));

#if XFS_BIG_INUMS

		ino += mp->m_inoadd;

#endif



		if (filldir(dirent, sfep->name, sfep->namelen,

			    off & 0x7fffffff, ino, DT_UNKNOWN)) {

			*offset = off & 0x7fffffff;