Skip to content

L
linux
Commit 66032dd1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nathan Scott
Browse files
Options

[XFS] fix jiffies (lbolt) compare 

SGI Modid: 2.5.x-xfs:slinx:130589a
parent d9627cf4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
fs/xfs/linux/xfs_linux.h
View file @ 66032dd1
...@@ -153,7 +153,6 @@ typedef struct xfs_dirent { /* data from readdir() */ ...@@ -153,7 +153,6 @@ typedef struct xfs_dirent { /* data from readdir() */
#define EFSCORRUPTED 990 /* Filesystem is corrupted */ #define EFSCORRUPTED 990 /* Filesystem is corrupted */
#define SYNCHRONIZE() barrier() #define SYNCHRONIZE() barrier()
#define lbolt jiffies
#define rootdev ROOT_DEV #define rootdev ROOT_DEV
#define __return_address __builtin_return_address(0) #define __return_address __builtin_return_address(0)
#define LONGLONG_MAX 9223372036854775807LL /* max "long long int" */ #define LONGLONG_MAX 9223372036854775807LL /* max "long long int" */
......
fs/xfs/xfs_buf_item.c
View file @ 66032dd1
...@@ -1029,12 +1029,12 @@ xfs_buf_iodone_callbacks( ...@@ -1029,12 +1029,12 @@ xfs_buf_iodone_callbacks(
} }
if ((XFS_BUF_TARGET_DEV(bp) != lastdev) || if ((XFS_BUF_TARGET_DEV(bp) != lastdev) ||
((lbolt - lasttime) > 500)) { (time_after(jiffies, (lasttime + 5*HZ)))) {
lasttime = jiffies;
prdev("XFS write error in file system meta-data " prdev("XFS write error in file system meta-data "
"block 0x%Lx in %s", "block 0x%Lx in %s",
XFS_BUF_TARGET_DEV(bp), XFS_BUF_TARGET_DEV(bp),
XFS_BUF_ADDR(bp), mp->m_fsname); XFS_BUF_ADDR(bp), mp->m_fsname);
lasttime = lbolt;
} }
lastdev = XFS_BUF_TARGET_DEV(bp); lastdev = XFS_BUF_TARGET_DEV(bp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7