Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs (5123bc35) · Commits · e / devices / android_kernel_oneplus_sm8150

fs/xfs/linux-2.6/mutex.h

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
		* All Rights Reserved.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it would be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write the Free Software Foundation,
		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
		*/
		#ifndef __XFS_SUPPORT_MUTEX_H__
		#define __XFS_SUPPORT_MUTEX_H__

		#include <linux/mutex.h>

		typedef struct mutex mutex_t;

		#endif /* __XFS_SUPPORT_MUTEX_H__ */

fs/xfs/linux-2.6/xfs_aops.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1623,4 +1623,5 @@ const struct address_space_operations xfs_address_space_operations = {
		.bmap = xfs_vm_bmap,
		.direct_IO = xfs_vm_direct_IO,
		.migratepage = buffer_migrate_page,
		.is_partially_uptodate = block_is_partially_uptodate,
		};

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_linux.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@
		#include <kmem.h>
		#include <mrlock.h>
		#include <sv.h>
		#include <mutex.h>
		#include <time.h>

		#include <support/ktrace.h>
		@@ -51,6 +50,7 @@
		#include <linux/blkdev.h>
		#include <linux/slab.h>
		#include <linux/module.h>
		#include <linux/mutex.h>
		#include <linux/file.h>
		#include <linux/swap.h>
		#include <linux/errno.h>

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);