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

Commit 6889e783 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next

parents 75e58ce4 a8b1ee8b

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/libxfs/xfs_da_btree.c

+2 −1
Original line number Diff line number Diff line
@@ -2563,6 +2563,7 @@ xfs_da_get_buf( 
				    mapp, nmap, 0);

	error = bp ? bp->b_error : -EIO;

	if (error) {

		if (bp)

			xfs_trans_brelse(trans, bp);

		goto out_free;

	}

fs/xfs/libxfs/xfs_sb.c

+5 −0
Original line number Diff line number Diff line
@@ -445,6 +445,8 @@ __xfs_sb_from_disk( 
	to->sb_features_incompat = be32_to_cpu(from->sb_features_incompat);

	to->sb_features_log_incompat =

				be32_to_cpu(from->sb_features_log_incompat);

	/* crc is only used on disk, not in memory; just init to 0 here. */

	to->sb_crc = 0;

	to->sb_pad = 0;

	to->sb_pquotino = be64_to_cpu(from->sb_pquotino);

	to->sb_lsn = be64_to_cpu(from->sb_lsn);
@@ -550,6 +552,9 @@ xfs_sb_to_disk( 
	if (!fields)

		return;



	/* We should never write the crc here, it's updated in the IO path */

	fields &= ~XFS_SB_CRC;



	xfs_sb_quota_to_disk(to, from, &fields);

	while (fields) {

		f = (xfs_sb_field_t)xfs_lowbit64((__uint64_t)fields);

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_aops.c

+7 −0
Original line number Diff line number Diff line
@@ -560,6 +560,13 @@ xfs_cancel_ioend( 
		do {

			next_bh = bh->b_private;

			clear_buffer_async_write(bh);

			/*

			 * The unwritten flag is cleared when added to the

			 * ioend. We're not submitting for I/O so mark the

			 * buffer unwritten again for next time around.

			 */

			if (ioend->io_type == XFS_IO_UNWRITTEN)

				set_buffer_unwritten(bh);

			unlock_buffer(bh);

		} while ((bh = next_bh) != NULL);