Merge git://oss.sgi.com:8090/xfs/xfs-2.6 (eea2078e) · Commits · 戴 / test

fs/xfs/Makefile-linux-2.6

+1 −16

Original line number	Diff line number	Diff line
		@@ -21,22 +21,7 @@ EXTRA_CFLAGS += -Ifs/xfs -Ifs/xfs/linux-2.6 -funsigned-char
		XFS_LINUX := linux-2.6

		ifeq ($(CONFIG_XFS_DEBUG),y)
		EXTRA_CFLAGS += -g -DSTATIC="" -DDEBUG
		EXTRA_CFLAGS += -DXFS_BUF_LOCK_TRACKING
		endif
		ifeq ($(CONFIG_XFS_TRACE),y)
		EXTRA_CFLAGS += -DXFS_ALLOC_TRACE
		EXTRA_CFLAGS += -DXFS_ATTR_TRACE
		EXTRA_CFLAGS += -DXFS_BLI_TRACE
		EXTRA_CFLAGS += -DXFS_BMAP_TRACE
		EXTRA_CFLAGS += -DXFS_BMBT_TRACE
		EXTRA_CFLAGS += -DXFS_DIR2_TRACE
		EXTRA_CFLAGS += -DXFS_DQUOT_TRACE
		EXTRA_CFLAGS += -DXFS_ILOCK_TRACE
		EXTRA_CFLAGS += -DXFS_LOG_TRACE
		EXTRA_CFLAGS += -DXFS_RW_TRACE
		EXTRA_CFLAGS += -DXFS_BUF_TRACE
		EXTRA_CFLAGS += -DXFS_VNODE_TRACE
		EXTRA_CFLAGS += -g
		endif

		obj-$(CONFIG_XFS_FS) += xfs.o

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		* along with this program; if not, write the Free Software Foundation,
		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
		*/
		#include "xfs.h"
		#include <linux/stddef.h>
		#include <linux/errno.h>
		#include <linux/slab.h>
		@@ -31,7 +32,6 @@
		#include <linux/kthread.h>
		#include <linux/migrate.h>
		#include <linux/backing-dev.h>
		#include "xfs_linux.h"

		STATIC kmem_zone_t *xfs_buf_zone;
		STATIC kmem_shaker_t xfs_buf_shake;
		@@ -1406,7 +1406,7 @@ xfs_alloc_bufhash(
		btp->bt_hashshift = external ? 3 : 8; /* 8 or 256 buckets */
		btp->bt_hashmask = (1 << btp->bt_hashshift) - 1;
		btp->bt_hash = kmem_zalloc((1 << btp->bt_hashshift) *
		sizeof(xfs_bufhash_t), KM_SLEEP);
		sizeof(xfs_bufhash_t), KM_SLEEP \| KM_LARGE);
		for (i = 0; i < (1 << btp->bt_hashshift); i++) {
		spin_lock_init(&btp->bt_hash[i].bh_lock);
		INIT_LIST_HEAD(&btp->bt_hash[i].bh_list);

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2000-2006 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_DMAPI_PRIV_H__
		#define __XFS_DMAPI_PRIV_H__

		/*
		* Based on IO_ISDIRECT, decide which i_ flag is set.
		*/
		#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \
		DM_FLAGS_IMUX : 0)
		#define DM_SEM_FLAG_WR (DM_FLAGS_IALLOCSEM_WR \| DM_FLAGS_IMUX)

		#endif /__XFS_DMAPI_PRIV_H__/

+4 −1

Original line number	Diff line number	Diff line
		@@ -341,8 +341,11 @@ xfs_open_by_handle(
		put_unused_fd(new_fd);
		return -XFS_ERROR(-PTR_ERR(filp));
		}
		if (inode->i_mode & S_IFREG)
		if (inode->i_mode & S_IFREG) {
		/* invisible operation should not change atime */
		filp->f_flags \|= O_NOATIME;
		filp->f_op = &xfs_invis_file_operations;
		}

		fd_install(new_fd, filp);
		return new_fd;

+1 −3

Original line number	Diff line number	Diff line
		@@ -227,9 +227,7 @@ xfs_initialize_vnode(
		xfs_revalidate_inode(XFS_BHVTOM(bdp), vp, ip);
		xfs_set_inodeops(inode);

		spin_lock(&ip->i_flags_lock);
		ip->i_flags &= ~XFS_INEW;
		spin_unlock(&ip->i_flags_lock);
		xfs_iflags_clear(ip, XFS_INEW);
		barrier();

		unlock_new_inode(inode);