p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfs: fix compiler warnings 

Fix up all the compiler warnings that have crept in.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2017-08-31 15:11:06 -07:00
parent d897246df9
commit 7bf7a193a9
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/libxfs/xfs_bmap.c
View File

@ -579,7 +579,7 @@ xfs_bmap_validate_ret(
#else #else
#define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0) #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) #define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
#endif /* DEBUG */ #endif /* DEBUG */
/* /*

9
fs/xfs/libxfs/xfs_inode_fork.c
View File

@ -1499,14 +1499,11 @@ xfs_iext_realloc_indirect(
xfs_ifork_t *ifp, /* inode fork pointer */ xfs_ifork_t *ifp, /* inode fork pointer */
int new_size) /* new indirection array size */ int new_size) /* new indirection array size */
{ {
int nlists; /* number of irec's (ex lists) */
int size; /* current indirection array size */
ASSERT(ifp->if_flags & XFS_IFEXTIREC); ASSERT(ifp->if_flags & XFS_IFEXTIREC);
nlists = ifp->if_real_bytes / XFS_IEXT_BUFSZ;
size = nlists * sizeof(xfs_ext_irec_t);
ASSERT(ifp->if_real_bytes); ASSERT(ifp->if_real_bytes);
ASSERT((new_size >= 0) && (new_size != size)); ASSERT((new_size >= 0) &&
(new_size != ((ifp->if_real_bytes / XFS_IEXT_BUFSZ) *
sizeof(xfs_ext_irec_t))));
if (new_size == 0) { if (new_size == 0) {
xfs_iext_destroy(ifp); xfs_iext_destroy(ifp);
} else { } else {

2
fs/xfs/xfs_buf_item.c
View File

@ -570,7 +570,9 @@ xfs_buf_item_unlock(
bool aborted = !!(lip->li_flags & XFS_LI_ABORTED); bool aborted = !!(lip->li_flags & XFS_LI_ABORTED);
bool hold = !!(bip->bli_flags & XFS_BLI_HOLD); bool hold = !!(bip->bli_flags & XFS_BLI_HOLD);
bool dirty = !!(bip->bli_flags & XFS_BLI_DIRTY); bool dirty = !!(bip->bli_flags & XFS_BLI_DIRTY);
#if defined(DEBUG) || defined(XFS_WARN)
bool ordered = !!(bip->bli_flags & XFS_BLI_ORDERED); bool ordered = !!(bip->bli_flags & XFS_BLI_ORDERED);
#endif
/* Clear the buffer's association with this transaction. */ /* Clear the buffer's association with this transaction. */
bp->b_transp = NULL; bp->b_transp = NULL;

2
fs/xfs/xfs_iops.c
View File

@ -817,7 +817,7 @@ xfs_vn_setattr_nonsize(
* Caution: The caller of this function is responsible for calling * Caution: The caller of this function is responsible for calling
* setattr_prepare() or otherwise verifying the change is fine. * setattr_prepare() or otherwise verifying the change is fine.
*/ */
int STATIC int
xfs_setattr_size( xfs_setattr_size(
struct xfs_inode *ip, struct xfs_inode *ip,
struct iattr *iattr) struct iattr *iattr)

4
fs/xfs/xfs_log_recover.c
View File

@ -4827,12 +4827,16 @@ xlog_recover_process_intents(
int error = 0; int error = 0;
struct xfs_ail_cursor cur; struct xfs_ail_cursor cur;
struct xfs_ail *ailp; struct xfs_ail *ailp;
#if defined(DEBUG) || defined(XFS_WARN)
xfs_lsn_t last_lsn; xfs_lsn_t last_lsn;
#endif
ailp = log->l_ailp; ailp = log->l_ailp;
spin_lock(&ailp->xa_lock); spin_lock(&ailp->xa_lock);
lip = xfs_trans_ail_cursor_first(ailp, &cur, 0); lip = xfs_trans_ail_cursor_first(ailp, &cur, 0);
#if defined(DEBUG) || defined(XFS_WARN)
last_lsn = xlog_assign_lsn(log->l_curr_cycle, log->l_curr_block); last_lsn = xlog_assign_lsn(log->l_curr_cycle, log->l_curr_block);
#endif
while (lip != NULL) { while (lip != NULL) {
/* /*
* We're done when we see something other than an intent. * We're done when we see something other than an intent.