← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to kernel/audit_tree.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-23.35
  • Date: 2013-01-25 17:38:28 UTC
  • Revision ID: package-import@ubuntu.com-20130125173828-5fgn3tm0ggs2th4j
Tags: 3.5.0-218.26
https://launchpad.net/bugs/1105143
https://launchpad.net/bugs/1103932
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1101666
https://launchpad.net/bugs/1103320
* Release Tracking Bug
  - LP: #1105143

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-23.35

[ Ubuntu: 3.5.0-23.35 ]

* Release Tracking Bug
  - LP: #1103932
* Revert "fsnotify: change locking order"
  - LP: #1101666
* Revert "fsnotify: dont put marks on temporary list when clearing marks
  by group"
  - LP: #1101666
* Revert "fsnotify: introduce locked versions of fsnotify_add_mark() and
  fsnotify_remove_mark()"
  - LP: #1101666
* Revert "fsnotify: pass group to fsnotify_destroy_mark()"
  - LP: #1101666
* Revert "fsnotify: use a mutex instead of a spinlock to protect a groups
  mark list"
  - LP: #1101666
* Revert "fanotify: add an extra flag to mark_remove_from_mask that
  indicates wheather a mark should be destroyed"
  - LP: #1101666
* Revert "fsnotify: take groups mark_lock before mark lock"
  - LP: #1101666
* Revert "fsnotify: use reference counting for groups"
  - LP: #1101666
* Revert "fsnotify: introduce fsnotify_get_group()"
  - LP: #1101666
* radeon/kms: force rn50 chip to always report connected on analog output
  - LP: #1103320

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/audit_tree.c
249
249
                list_del_rcu(&chunk->hash);
250
250
                spin_unlock(&hash_lock);
251
251
                spin_unlock(&entry->lock);
252
 
                fsnotify_destroy_mark(entry, audit_tree_group);
 
252
                fsnotify_destroy_mark(entry);
253
253
                goto out;
254
254
        }
255
255
 
291
291
                owner->root = new;
292
292
        spin_unlock(&hash_lock);
293
293
        spin_unlock(&entry->lock);
294
 
        fsnotify_destroy_mark(entry, audit_tree_group);
295
 
        fsnotify_put_mark(&new->mark);  /* drop initial reference */
 
294
        fsnotify_destroy_mark(entry);
296
295
        goto out;
297
296
 
298
297
Fallback:
331
330
                spin_unlock(&hash_lock);
332
331
                chunk->dead = 1;
333
332
                spin_unlock(&entry->lock);
334
 
                fsnotify_destroy_mark(entry, audit_tree_group);
 
333
                fsnotify_get_mark(entry);
 
334
                fsnotify_destroy_mark(entry);
335
335
                fsnotify_put_mark(entry);
336
336
                return 0;
337
337
        }
411
411
                spin_unlock(&chunk_entry->lock);
412
412
                spin_unlock(&old_entry->lock);
413
413
 
414
 
                fsnotify_destroy_mark(chunk_entry, audit_tree_group);
 
414
                fsnotify_get_mark(chunk_entry);
 
415
                fsnotify_destroy_mark(chunk_entry);
415
416
 
416
417
                fsnotify_put_mark(chunk_entry);
417
418
                fsnotify_put_mark(old_entry);
442
443
        spin_unlock(&hash_lock);
443
444
        spin_unlock(&chunk_entry->lock);
444
445
        spin_unlock(&old_entry->lock);
445
 
        fsnotify_destroy_mark(old_entry, audit_tree_group);
446
 
        fsnotify_put_mark(chunk_entry); /* drop initial reference */
 
446
        fsnotify_destroy_mark(old_entry);
447
447
        fsnotify_put_mark(old_entry); /* pair to fsnotify_find mark_entry */
448
448
        return 0;
449
449
}