b=14208
i=zhenyu.xu, johann
Original patch by Brian Behlendorf <behlendorf1@llnl.gov>
Replace macro __LINUX__ with __linux__.
LASSERTF((pg->off & ~CFS_PAGE_MASK) + pg->count <= CFS_PAGE_SIZE,
"i: %d pg: %p off: "LPU64", count: %u\n", i, pg,
pg->off, pg->count);
LASSERTF((pg->off & ~CFS_PAGE_MASK) + pg->count <= CFS_PAGE_SIZE,
"i: %d pg: %p off: "LPU64", count: %u\n", i, pg,
pg->off, pg->count);
LASSERTF(i == 0 || pg->off > pg_prev->off,
"i %d p_c %u pg %p [pri %lu ind %lu] off "LPU64
" prev_pg %p [pri %lu ind %lu] off "LPU64"\n",
LASSERTF(i == 0 || pg->off > pg_prev->off,
"i %d p_c %u pg %p [pri %lu ind %lu] off "LPU64
" prev_pg %p [pri %lu ind %lu] off "LPU64"\n",
* XXX nikita: this assertion should be adjusted when lustre
* starts using PG_writeback for pages being written out.
*/
* XXX nikita: this assertion should be adjusted when lustre
* starts using PG_writeback for pages being written out.
*/
-#if defined(__KERNEL__) && defined(__LINUX__)
+#if defined(__KERNEL__) && defined(__linux__)
LASSERT(PageLocked(oap->oap_page));
#endif
/* If there is a gap at the start of this page, it can't merge
LASSERT(PageLocked(oap->oap_page));
#endif
/* If there is a gap at the start of this page, it can't merge
return;
}
lock_res_and_lock(lock);
return;
}
lock_res_and_lock(lock);
-#if defined (__KERNEL__) && defined (__LINUX__)
+#if defined (__KERNEL__) && defined (__linux__)
/* Liang XXX: Darwin and Winnt checking should be added */
if (lock->l_ast_data && lock->l_ast_data != data) {
struct inode *new_inode = data;
/* Liang XXX: Darwin and Winnt checking should be added */
if (lock->l_ast_data && lock->l_ast_data != data) {
struct inode *new_inode = data;