← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/gfs2/file.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-22.34
  • Date: 2013-01-11 15:02:20 UTC
  • mfrom: (72.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130111150220-kgmbtlwhyc4kwqhg
Tags: 3.5.0-217.25
https://launchpad.net/bugs/1097912
https://launchpad.net/bugs/1097343
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
* Release Tracking Bug
  - LP: #1097912

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-22.34

[ Ubuntu: 3.5.0-22.34 ]

* Release Tracking Bug
  - LP: #1097343
* Revert "SAUCE: fsnotify: dont put marks on temporary list when clearing
  marks by group"
  - LP: #1096137
* Revert "SAUCE: fsnotify: introduce locked versions of
  fsnotify_add_mark() and fsnotify_remove_mark()"
  - LP: #1096137
* Revert "SAUCE: fsnotify: pass group to fsnotify_destroy_mark()"
  - LP: #1096137
* Revert "SAUCE: fsnotify: use a mutex instead of a spinlock to protect a
  groups mark list"
  - LP: #1096137
* Revert "SAUCE: fanotify: add an extra flag to mark_remove_from_mask
  that indicates wheather a mark should be destroyed"
  - LP: #1096137
* Revert "SAUCE: fsnotify: take groups mark_lock before mark lock"
  - LP: #1096137
* Revert "SAUCE: fsnotify: use reference counting for groups"
  - LP: #1096137
* Revert "SAUCE: fsnotify: introduce fsnotify_get_group()"
  - LP: #1096137
* fsnotify: introduce fsnotify_get_group()
  - LP: #1096137
* fsnotify: use reference counting for groups
  - LP: #1096137
* fsnotify: take groups mark_lock before mark lock
  - LP: #1096137
* fanotify: add an extra flag to mark_remove_from_mask that indicates
  wheather a mark should be destroyed
  - LP: #1096137
* fsnotify: use a mutex instead of a spinlock to protect a groups mark
  list
  - LP: #1096137
* fsnotify: pass group to fsnotify_destroy_mark()
  - LP: #1096137
* fsnotify: introduce locked versions of fsnotify_add_mark() and
  fsnotify_remove_mark()
  - LP: #1096137
* fsnotify: dont put marks on temporary list when clearing marks by group
  - LP: #1096137
* fsnotify: change locking order
  - LP: #1096137

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/gfs2/file.c
492
492
                struct gfs2_holder i_gh;
493
493
                int error;
494
494
 
495
 
                gfs2_holder_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh);
496
 
                error = gfs2_glock_nq(&i_gh);
497
 
                if (error == 0) {
498
 
                        file_accessed(file);
499
 
                        gfs2_glock_dq(&i_gh);
500
 
                }
501
 
                gfs2_holder_uninit(&i_gh);
 
495
                error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY,
 
496
                                           &i_gh);
502
497
                if (error)
503
498
                        return error;
 
499
                /* grab lock to update inode */
 
500
                gfs2_glock_dq_uninit(&i_gh);
 
501
                file_accessed(file);
504
502
        }
505
503
        vma->vm_ops = &gfs2_vm_ops;
506
504
        vma->vm_flags |= VM_CAN_NONLINEAR;