From 9c9e0797ee7c2e58a6534530554cba2bd3a1154e Mon Sep 17 00:00:00 2001 From: braam Date: Mon, 21 Oct 2002 04:25:20 +0000 Subject: [PATCH] - compile fixes for 2.5.44 - echo works again --- lustre/include/linux/lustre_lite.h | 4 ++++ lustre/include/linux/lustre_net.h | 6 ++++++ lustre/ldlm/ldlm_test.c | 7 ++++--- lustre/llite/commit_callback.c | 5 +++++ lustre/llite/file.c | 2 +- lustre/llite/namei.c | 12 ++++++------ lustre/llite/super25.c | 2 +- lustre/mdc/mdc_request.c | 2 +- lustre/osc/osc_request.c | 6 +++--- lustre/ptlrpc/recovd.c | 7 ++++--- lustre/ptlrpc/service.c | 7 ++++--- 11 files changed, 39 insertions(+), 21 deletions(-) diff --git a/lustre/include/linux/lustre_lite.h b/lustre/include/linux/lustre_lite.h index 46da130..f877713 100644 --- a/lustre/include/linux/lustre_lite.h +++ b/lustre/include/linux/lustre_lite.h @@ -99,7 +99,11 @@ do { \ static inline struct ll_sb_info *ll_s2sbi(struct super_block *sb) { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) + return (struct ll_sb_info *)(sb->s_fs_info); +#else return (struct ll_sb_info *)(sb->u.generic_sbp); +#endif } static inline struct lustre_handle *ll_s2obdconn(struct super_block *sb) diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h index b6098e2..dc6c090 100644 --- a/lustre/include/linux/lustre_net.h +++ b/lustre/include/linux/lustre_net.h @@ -174,6 +174,7 @@ struct ptlrpc_bulk_page { int (*bp_cb)(struct ptlrpc_bulk_page *); }; + struct ptlrpc_bulk_desc { int bd_flags; struct ptlrpc_connection *bd_connection; @@ -188,7 +189,12 @@ struct ptlrpc_bulk_desc { __u32 bd_page_count; atomic_t bd_refcount; void *bd_desc_private; + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) + struct work_struct bd_queue; +#else struct tq_struct bd_queue; +#endif ptl_md_t bd_md; ptl_handle_md_t bd_md_h; diff --git a/lustre/ldlm/ldlm_test.c b/lustre/ldlm/ldlm_test.c index fa387a0..ce7a73d 100644 --- a/lustre/ldlm/ldlm_test.c +++ b/lustre/ldlm/ldlm_test.c @@ -436,14 +436,15 @@ static int ldlm_test_main(void *data) lock_kernel(); daemonize(); - spin_lock_irq(¤t->sigmask_lock); - sigfillset(¤t->blocked); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) + sigfillset(¤t->blocked); recalc_sigpending(); #else + spin_lock_irq(¤t->sigmask_lock); + sigfillset(¤t->blocked); recalc_sigpending(current); -#endif spin_unlock_irq(¤t->sigmask_lock); +#endif sprintf(current->comm, "ldlm_test"); unlock_kernel(); diff --git a/lustre/llite/commit_callback.c b/lustre/llite/commit_callback.c index 0be55df..e5a595a 100644 --- a/lustre/llite/commit_callback.c +++ b/lustre/llite/commit_callback.c @@ -58,10 +58,15 @@ static int ll_commitcbd_main(void *arg) lock_kernel(); daemonize(); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) spin_lock_irq(¤t->sigmask_lock); sigfillset(¤t->blocked); our_recalc_sigpending(current); spin_unlock_irq(¤t->sigmask_lock); +#else + sigfillset(¤t->blocked); + our_recalc_sigpending(current); +#endif sprintf(current->comm, "lustre_commitcbd"); unlock_kernel(); diff --git a/lustre/llite/file.c b/lustre/llite/file.c index d244e7f..bae0711 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -402,7 +402,7 @@ int ll_lock_callback(struct ldlm_lock *lock, struct ldlm_lock_desc *new, CDEBUG(D_INODE, "invalidating obdo/inode %ld\n", inode->i_ino); /* FIXME: do something better than throwing away everything */ //down(&inode->i_sem); - invalidate_inode_pages(inode); + ll_invalidate_inode_pages(inode); //up(&inode->i_sem); break; default: diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index 26c295a..d710be6 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -375,7 +375,7 @@ static struct inode *ll_create_node(struct inode *dir, const char *name, namelen, name, rc); RETURN(ERR_PTR(rc)); } - invalidate_inode_pages(dir); + ll_invalidate_inode_pages(dir); request = it->it_data; body = lustre_msg_buf(request->rq_repmsg, 1); lic.lic_lmm = NULL; @@ -607,7 +607,7 @@ static int ll_link(struct dentry *old_dentry, struct inode * dir, ext2_inc_count(inode); atomic_inc(&inode->i_count); d_instantiate(dentry, inode); - invalidate_inode_pages(dir); + ll_invalidate_inode_pages(dir); RETURN(0); } @@ -687,7 +687,7 @@ static int ll_common_unlink(struct inode *dir, struct dentry *dentry, if (it && it->it_disposition) { rc = it->it_status; - invalidate_inode_pages(dir); + ll_invalidate_inode_pages(dir); if (rc) GOTO(out, rc); GOTO(out_dec, 0); @@ -708,7 +708,7 @@ static int ll_common_unlink(struct inode *dir, struct dentry *dentry, /* AED: not sure if needed - directory lock revocation should do it * in the case where the client has cached it for non-intent ops. */ - invalidate_inode_pages(dir); + ll_invalidate_inode_pages(dir); inode->i_ctime = dir->i_ctime; out_dec: @@ -768,8 +768,8 @@ static int ll_rename(struct inode * old_dir, struct dentry * old_dentry, tgt_inode->i_ctime = CURRENT_TIME; tgt_inode->i_nlink--; } - invalidate_inode_pages(old_dir); - invalidate_inode_pages(new_dir); + ll_invalidate_inode_pages(old_dir); + ll_invalidate_inode_pages(new_dir); GOTO(out, err = it->it_status); } diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c index d7c8355..83867eb 100644 --- a/lustre/llite/super25.c +++ b/lustre/llite/super25.c @@ -127,7 +127,7 @@ static int ll_fill_super(struct super_block *sb, void *data, int silent) generate_random_uuid(uuid); class_uuid_unparse(uuid, sbi->ll_sb_uuid); - sb->u.generic_sbp = sbi; + sb->s_fs_info = sbi; ll_options(data, &osc, &mdc, &sbi->ll_flags); diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c index 1fb85e2..a044b10 100644 --- a/lustre/mdc/mdc_request.c +++ b/lustre/mdc/mdc_request.c @@ -186,7 +186,7 @@ static int mdc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, if (S_ISDIR(inode->i_mode)) { CDEBUG(D_INODE, "invalidating inode %ld\n", inode->i_ino); - invalidate_inode_pages(inode); + ll_invalidate_inode_pages(inode); } break; default: diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index a976023..66b646e 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -23,6 +23,7 @@ #include #include #include +#include #include /* for mds_objid */ #include #include @@ -343,9 +344,8 @@ static void brw_finish(struct ptlrpc_bulk_desc *desc, void *data) /* We can't kunmap the desc from interrupt context, so we do it from * the bottom half above. */ - INIT_TQUEUE(&desc->bd_queue, 0, 0); - PREPARE_TQUEUE(&desc->bd_queue, unmap_and_decref_bulk_desc, desc); - schedule_task(&desc->bd_queue); + prepare_work(&desc->bd_queue, unmap_and_decref_bulk_desc, desc); + schedule_work(&desc->bd_queue); EXIT; } diff --git a/lustre/ptlrpc/recovd.c b/lustre/ptlrpc/recovd.c index b3a76f4..180c339 100644 --- a/lustre/ptlrpc/recovd.c +++ b/lustre/ptlrpc/recovd.c @@ -274,15 +274,16 @@ static int recovd_main(void *arg) lock_kernel(); daemonize(); - spin_lock_irq(¤t->sigmask_lock); - sigfillset(¤t->blocked); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) + sigfillset(¤t->blocked); recalc_sigpending(); #else + spin_lock_irq(¤t->sigmask_lock); + sigfillset(¤t->blocked); recalc_sigpending(current); -#endif spin_unlock_irq(¤t->sigmask_lock); +#endif sprintf(current->comm, "lustre_recovd"); unlock_kernel(); diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index 5bebd0a..e80a8de 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -239,14 +239,15 @@ static int ptlrpc_main(void *arg) lock_kernel(); daemonize(); - spin_lock_irq(¤t->sigmask_lock); - sigfillset(¤t->blocked); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) + sigfillset(¤t->blocked); recalc_sigpending(); #else + spin_lock_irq(¤t->sigmask_lock); + sigfillset(¤t->blocked); recalc_sigpending(current); -#endif spin_unlock_irq(¤t->sigmask_lock); +#endif strcpy(current->comm, data->name); unlock_kernel(); -- 1.8.3.1