Commit bb19fba1 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Sync up one/two other minor changes missed in previous merges. 



Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent e15f195c

fs/xfs/Makefile-linux-2.6

+13 −27
Original line number Diff line number Diff line 
#

# Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.

# Copyright (c) 2000-2005 Silicon Graphics, Inc.

# All Rights Reserved.

#

# This program is free software; you can redistribute it and/or modify it

# under the terms of version 2 of the GNU General Public License as

# 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.

# 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.

#

# Further, this software is distributed without any warranty that it is

# free of the rightful claim of any third person regarding infringement

# or the like.  Any license provided herein, whether implied or

# otherwise, applies only to this software file.  Patent licenses, if

# any, provided herein do not apply to combinations of this program with

# other software, or any other product whatsoever.

#

# You should have received a copy of the GNU General Public License along

# with this program; if not, write the Free Software Foundation, Inc., 59

# Temple Place - Suite 330, Boston MA 02111-1307, USA.

#

# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,

# Mountain View, CA  94043, or:

#

# http://www.sgi.com

#

# For further information regarding this notice, see:

#

# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/

# 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

#



EXTRA_CFLAGS +=	 -Ifs/xfs -Ifs/xfs/linux-2.6 -funsigned-char
@@ -36,7 +22,7 @@ XFS_LINUX := linux-2.6 


ifeq ($(CONFIG_XFS_DEBUG),y)

	EXTRA_CFLAGS += -g -DSTATIC="" -DDEBUG

	EXTRA_CFLAGS += -DPAGEBUF_LOCK_TRACKING

	EXTRA_CFLAGS += -DXFS_BUF_LOCK_TRACKING

endif

ifeq ($(CONFIG_XFS_TRACE),y)

	EXTRA_CFLAGS += -DXFS_ALLOC_TRACE
@@ -50,7 +36,7 @@ ifeq ($(CONFIG_XFS_TRACE),y) 
	EXTRA_CFLAGS += -DXFS_ILOCK_TRACE

	EXTRA_CFLAGS += -DXFS_LOG_TRACE

	EXTRA_CFLAGS += -DXFS_RW_TRACE

	EXTRA_CFLAGS += -DPAGEBUF_TRACE

	EXTRA_CFLAGS += -DXFS_BUF_TRACE

	EXTRA_CFLAGS += -DXFS_VNODE_TRACE

endif

fs/xfs/linux-2.6/xfs_super.c

+1 −3
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ xfs_flush_device( 
	xfs_log_force(ip->i_mount, (xfs_lsn_t)0, XFS_LOG_FORCE|XFS_LOG_SYNC);

}



#define SYNCD_FLAGS	(SYNC_FSDATA|SYNC_BDFLUSH|SYNC_ATTR)

#define SYNCD_FLAGS	(SYNC_FSDATA|SYNC_BDFLUSH|SYNC_ATTR|SYNC_REFCACHE)

STATIC void

vfs_sync_worker(

	vfs_t		*vfsp,
@@ -972,7 +972,6 @@ init_xfs_fs( void ) 
	error = register_filesystem(&xfs_fs_type);

	if (error)

		goto undo_register;

	XFS_DM_INIT(&xfs_fs_type);

	return 0;



undo_register:
@@ -989,7 +988,6 @@ STATIC void __exit 
exit_xfs_fs( void )

{

	vfs_exitquota();

	XFS_DM_EXIT(&xfs_fs_type);

	unregister_filesystem(&xfs_fs_type);

	xfs_cleanup();

	xfs_buf_terminate();

fs/xfs/xfs_dmapi.h

+0 −10
Original line number Diff line number Diff line
@@ -191,14 +191,4 @@ typedef enum { 


extern struct bhv_vfsops xfs_dmops;



#ifdef CONFIG_XFS_DMAPI

void xfs_dm_init(struct file_system_type *);

void xfs_dm_exit(struct file_system_type *);

#define XFS_DM_INIT(fstype)	xfs_dm_init(fstype)

#define XFS_DM_EXIT(fstype)	xfs_dm_exit(fstype)

#else

#define XFS_DM_INIT(fstype)

#define XFS_DM_EXIT(fstype)

#endif



#endif  /* __XFS_DMAPI_H__ */

fs/xfs/xfs_rw.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ extern void xfs_ioerror_alert(char *func, struct xfs_mount *mp, 
 */

extern int xfs_rwlock(bhv_desc_t *bdp, vrwlock_t write_lock);

extern void xfs_rwunlock(bhv_desc_t *bdp, vrwlock_t write_lock);

extern int xfs_setattr(bhv_desc_t *bdp, vattr_t *vap, int flags, cred_t *credp);

extern int xfs_change_file_space(bhv_desc_t *bdp, int cmd, xfs_flock64_t *bf,

				 xfs_off_t offset, cred_t *credp, int flags);

extern int xfs_set_dmattrs(bhv_desc_t *bdp, u_int evmask, u_int16_t state,

fs/xfs/xfs_vnodeops.c

+3 −3

File changed.

Contains only whitespace changes.