Commit 6e8ba009 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.4-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Pull xfs fix from Darrick Wong:
 "The single fix converts the seconds field in the recently added XFS
  bulkstat structure to a signed 64-bit quantity.

  The structure layout doesn't change and so far there are no users of
  the ioctl to break because we only publish xfs ioctl interfaces
  through the XFS userspace development libraries, and we're still
  working on a 5.3 release"

* tag 'xfs-5.4-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: change the seconds fields in xfs_bulkstat to signed
parents 839e0f04 5e0cd1ef
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -366,11 +366,11 @@ struct xfs_bulkstat {
	uint64_t	bs_blocks;	/* number of blocks		*/
	uint64_t	bs_xflags;	/* extended flags		*/

	uint64_t	bs_atime;	/* access time, seconds		*/
	uint64_t	bs_mtime;	/* modify time, seconds		*/
	int64_t		bs_atime;	/* access time, seconds		*/
	int64_t		bs_mtime;	/* modify time, seconds		*/

	uint64_t	bs_ctime;	/* inode change time, seconds	*/
	uint64_t	bs_btime;	/* creation time, seconds	*/
	int64_t		bs_ctime;	/* inode change time, seconds	*/
	int64_t		bs_btime;	/* creation time, seconds	*/

	uint32_t	bs_gen;		/* generation count		*/
	uint32_t	bs_uid;		/* user id			*/