git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
fs
/
notify
/
vfsmount_mark.c
diff --git
a/fs/notify/vfsmount_mark.c
b/fs/notify/vfsmount_mark.c
index
b7ae640
..
56772b5
100644
(file)
--- a/
fs/notify/vfsmount_mark.c
+++ b/
fs/notify/vfsmount_mark.c
@@
-145,7
+145,7
@@
int fsnotify_add_vfsmount_mark(struct fsnotify_mark *mark,
struct hlist_node *node, *last = NULL;
int ret = 0;
- mark->flags = FSNOTIFY_MARK_FLAG_VFSMOUNT;
+ mark->flags
|
= FSNOTIFY_MARK_FLAG_VFSMOUNT;
assert_spin_locked(&mark->lock);
assert_spin_locked(&group->mark_lock);