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

Commit e076b0f3 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: kill time.h 



The typedef for timespecs and nanotime() are completely unnecessary,
and delay() can be moved to fs/xfs/linux.h, which means this file
can go away.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent b1d6cc02

fs/xfs/kmem.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/swap.h>

#include <linux/blkdev.h>

#include <linux/backing-dev.h>

#include "time.h"

#include "kmem.h"

#include "xfs_message.h"

fs/xfs/time.h

deleted100644 → 0
+0 −36
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_TIME_H__

#define __XFS_SUPPORT_TIME_H__



#include <linux/sched.h>

#include <linux/time.h>



typedef struct timespec timespec_t;



static inline void delay(long ticks)

{

	schedule_timeout_uninterruptible(ticks);

}



static inline void nanotime(struct timespec *tvp)

{

	*tvp = CURRENT_TIME;

}



#endif /* __XFS_SUPPORT_TIME_H__ */

fs/xfs/xfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ xfs_ialloc( 
	xfs_inode_t	*ip;

	uint		flags;

	int		error;

	timespec_t	tv;

	struct timespec	tv;



	/*

	 * Call the space management code to pick
@@ -720,7 +720,7 @@ xfs_ialloc( 
	ip->i_d.di_nextents = 0;

	ASSERT(ip->i_d.di_nblocks == 0);



	nanotime(&tv);

	tv = current_fs_time(mp->m_super);

	ip->i_d.di_mtime.t_sec = (__int32_t)tv.tv_sec;

	ip->i_d.di_mtime.t_nsec = (__int32_t)tv.tv_nsec;

	ip->i_d.di_atime = ip->i_d.di_mtime;

fs/xfs/xfs_linux.h

+5 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ typedef __uint64_t __psunsigned_t; 


#include "kmem.h"

#include "mrlock.h"

#include "time.h"

#include "uuid.h"



#include <linux/semaphore.h>
@@ -179,6 +178,11 @@ typedef __uint64_t __psunsigned_t; 
#define MAX(a,b)	(max(a,b))

#define howmany(x, y)	(((x)+((y)-1))/(y))



static inline void delay(long ticks)

{

	schedule_timeout_uninterruptible(ticks);

}



/*

 * XFS wrapper structure for sysfs support. It depends on external data

 * structures and is embedded in various internal data structures to implement

fs/xfs/xfs_trans_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ xfs_trans_ichgtime( 
	int			flags)

{

	struct inode		*inode = VFS_I(ip);

	timespec_t		tv;

	struct timespec		tv;



	ASSERT(tp);

	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));