diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-09 22:27:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 22:27:33 -0700 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /include/linux/fsnotify_backend.h | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'include/linux/fsnotify_backend.h')
| -rw-r--r-- | include/linux/fsnotify_backend.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index ed36fb57c42..e40190d1687 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h @@ -156,6 +156,7 @@ struct fsnotify_group { struct mutex access_mutex; struct list_head access_list; wait_queue_head_t access_waitq; + bool bypass_perm; /* protected by access_mutex */ #endif /* CONFIG_FANOTIFY_ACCESS_PERMISSIONS */ int f_flags; } fanotify_data; |