(メッセージはありません)
trunk/caitsith-patch/caitsith/probe.c (diff)| @@ -464,7 +464,7 @@ | ||
| 464 | 464 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 3) |
| 465 | 465 | |
| 466 | 466 | /* Dummy variable for finding address of "spinlock_t vfsmount_lock". */ |
| 467 | -static spinlock_t probe_vfsmount_lock __cacheline_aligned_in_smp = | |
| 467 | +static spinlock_t probe_dummy_vfsmount_lock __cacheline_aligned_in_smp = | |
| 468 | 468 | SPIN_LOCK_UNLOCKED; |
| 469 | 469 | |
| 470 | 470 | static struct list_head *probe_mount_hashtable; |
| @@ -501,7 +501,7 @@ | ||
| 501 | 501 | struct list_head *tmp = head; |
| 502 | 502 | struct vfsmount *p, *found = NULL; |
| 503 | 503 | |
| 504 | - spin_lock(&probe_vfsmount_lock); | |
| 504 | + spin_lock(&probe_dummy_vfsmount_lock); | |
| 505 | 505 | for (;;) { |
| 506 | 506 | tmp = tmp->next; |
| 507 | 507 | p = NULL; |
| @@ -513,7 +513,7 @@ | ||
| 513 | 513 | break; |
| 514 | 514 | } |
| 515 | 515 | } |
| 516 | - spin_unlock(&probe_vfsmount_lock); | |
| 516 | + spin_unlock(&probe_dummy_vfsmount_lock); | |
| 517 | 517 | return found; |
| 518 | 518 | } |
| 519 | 519 |
| @@ -528,7 +528,7 @@ | ||
| 528 | 528 | spinlock_t *ptr; |
| 529 | 529 | /* Guess "spinlock_t vfsmount_lock;". */ |
| 530 | 530 | cp = probe_find_variable(probe_lookup_mnt, (unsigned long) |
| 531 | - &probe_vfsmount_lock, " lookup_mnt\n"); | |
| 531 | + &probe_dummy_vfsmount_lock, " lookup_mnt\n"); | |
| 532 | 532 | if (!cp) { |
| 533 | 533 | printk(KERN_ERR "Can't resolve lookup_mnt().\n"); |
| 534 | 534 | return NULL; |
| @@ -546,7 +546,7 @@ | ||
| 546 | 546 | #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) |
| 547 | 547 | |
| 548 | 548 | /* Dummy variable for finding address of "spinlock_t vfsmount_lock". */ |
| 549 | -static spinlock_t probe_vfsmount_lock; | |
| 549 | +static spinlock_t probe_dummy_vfsmount_lock; | |
| 550 | 550 | |
| 551 | 551 | /** |
| 552 | 552 | * probe_follow_up - Dummy function which does identical to follow_up() in fs/namei.c. |
| @@ -560,15 +560,15 @@ | ||
| 560 | 560 | { |
| 561 | 561 | struct vfsmount *parent; |
| 562 | 562 | struct dentry *mountpoint; |
| 563 | - spin_lock(&probe_vfsmount_lock); | |
| 563 | + spin_lock(&probe_dummy_vfsmount_lock); | |
| 564 | 564 | parent = (*mnt)->mnt_parent; |
| 565 | 565 | if (parent == *mnt) { |
| 566 | - spin_unlock(&probe_vfsmount_lock); | |
| 566 | + spin_unlock(&probe_dummy_vfsmount_lock); | |
| 567 | 567 | return 0; |
| 568 | 568 | } |
| 569 | 569 | mntget(parent); |
| 570 | 570 | mountpoint = dget((*mnt)->mnt_mountpoint); |
| 571 | - spin_unlock(&probe_vfsmount_lock); | |
| 571 | + spin_unlock(&probe_dummy_vfsmount_lock); | |
| 572 | 572 | dput(*dentry); |
| 573 | 573 | *dentry = mountpoint; |
| 574 | 574 | mntput(*mnt); |
| @@ -587,7 +587,7 @@ | ||
| 587 | 587 | spinlock_t *ptr; |
| 588 | 588 | /* Guess "spinlock_t vfsmount_lock;". */ |
| 589 | 589 | cp = probe_find_variable(probe_follow_up, (unsigned long) |
| 590 | - &probe_vfsmount_lock, "follow_up"); | |
| 590 | + &probe_dummy_vfsmount_lock, "follow_up"); | |
| 591 | 591 | if (!cp) { |
| 592 | 592 | printk(KERN_ERR "Can't resolve follow_up().\n"); |
| 593 | 593 | return NULL; |
| @@ -605,7 +605,7 @@ | ||
| 605 | 605 | #else |
| 606 | 606 | |
| 607 | 607 | /* Dummy variable for finding address of "spinlock_t vfsmount_lock". */ |
| 608 | -static spinlock_t probe_vfsmount_lock; | |
| 608 | +static spinlock_t probe_dummy_vfsmount_lock; | |
| 609 | 609 | |
| 610 | 610 | /** |
| 611 | 611 | * probe_mnt_pin - Dummy function which does identical to mnt_pin() in fs/namespace.c. |
| @@ -616,9 +616,9 @@ | ||
| 616 | 616 | */ |
| 617 | 617 | static void probe_mnt_pin(struct vfsmount *mnt) |
| 618 | 618 | { |
| 619 | - spin_lock(&probe_vfsmount_lock); | |
| 619 | + spin_lock(&probe_dummy_vfsmount_lock); | |
| 620 | 620 | mnt->mnt_pinned++; |
| 621 | - spin_unlock(&probe_vfsmount_lock); | |
| 621 | + spin_unlock(&probe_dummy_vfsmount_lock); | |
| 622 | 622 | } |
| 623 | 623 | |
| 624 | 624 | /** |
| @@ -632,7 +632,7 @@ | ||
| 632 | 632 | spinlock_t *ptr; |
| 633 | 633 | /* Guess "spinlock_t vfsmount_lock;". */ |
| 634 | 634 | cp = probe_find_variable(probe_mnt_pin, (unsigned long) |
| 635 | - &probe_vfsmount_lock, "mnt_pin"); | |
| 635 | + &probe_dummy_vfsmount_lock, "mnt_pin"); | |
| 636 | 636 | if (!cp) { |
| 637 | 637 | printk(KERN_ERR "Can't resolve mnt_pin().\n"); |
| 638 | 638 | return NULL; |
| @@ -655,7 +655,7 @@ | ||
| 655 | 655 | * Never mark this variable as __initdata , for this variable might be accessed |
| 656 | 656 | * by caller of probe_find_vfsmount_lock(). |
| 657 | 657 | */ |
| 658 | -static spinlock_t probe_vfsmount_lock; | |
| 658 | +static spinlock_t probe_dummy_vfsmount_lock; | |
| 659 | 659 | |
| 660 | 660 | /** |
| 661 | 661 | * probe_vfsmount_lock - Find address of "spinlock_t vfsmount_lock". |
| @@ -664,7 +664,7 @@ | ||
| 664 | 664 | */ |
| 665 | 665 | void * __init probe_vfsmount_lock(void) |
| 666 | 666 | { |
| 667 | - return &probe_vfsmount_lock; | |
| 667 | + return &probe_dummy_vfsmount_lock; | |
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | #endif |
