summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-02-01 10:59:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:37 -0500
commit6b5c848e9140b95a8902f96a1d363da9feac9588 (patch)
tree001c4f489fa121028d1ad3dedecc1fc8741836f9
parent91cf91e02849df4e94d221b93bf455f058a0c07d (diff)
downloadsamba-6b5c848e9140b95a8902f96a1d363da9feac9588.tar.gz
samba-6b5c848e9140b95a8902f96a1d363da9feac9588.tar.bz2
samba-6b5c848e9140b95a8902f96a1d363da9feac9588.zip
r21104: Rename struct watch_context to struct inotify_watch_context
(This used to be commit 7ac79203f247ed4e41d1612ea82211db8c0cd644)
-rw-r--r--source3/smbd/notify_inotify.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index 39dc7e53e7..5fb414de4c 100644
--- a/source3/smbd/notify_inotify.c
+++ b/source3/smbd/notify_inotify.c
@@ -61,11 +61,11 @@ static int inotify_rm_watch(int fd, int wd)
struct inotify_private {
struct sys_notify_context *ctx;
int fd;
- struct watch_context *watches;
+ struct inotify_watch_context *watches;
};
-struct watch_context {
- struct watch_context *next, *prev;
+struct inotify_watch_context {
+ struct inotify_watch_context *next, *prev;
struct inotify_private *in;
int wd;
void (*callback)(struct sys_notify_context *ctx,
@@ -92,7 +92,8 @@ static int inotify_destructor(struct inotify_private *in)
see if a particular event from inotify really does match a requested
notify event in SMB
*/
-static BOOL filter_match(struct watch_context *w, struct inotify_event *e)
+static BOOL filter_match(struct inotify_watch_context *w,
+ struct inotify_event *e)
{
DEBUG(10, ("filter_match: e->mask=%x, w->mask=%x, w->filter=%x\n",
e->mask, w->mask, w->filter));
@@ -141,7 +142,7 @@ static void inotify_dispatch(struct inotify_private *in,
uint32_t prev_cookie,
struct inotify_event *e2)
{
- struct watch_context *w, *next;
+ struct inotify_watch_context *w, *next;
struct notify_event ne;
DEBUG(10, ("inotify_dispatch called with mask=%x, name=[%s]\n",
@@ -320,7 +321,7 @@ static uint32_t inotify_map(struct notify_entry *e)
/*
destroy a watch
*/
-static int watch_destructor(struct watch_context *w)
+static int watch_destructor(struct inotify_watch_context *w)
{
struct inotify_private *in = w->in;
int wd = w->wd;
@@ -357,7 +358,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
struct inotify_private *in;
int wd;
uint32_t mask;
- struct watch_context *w;
+ struct inotify_watch_context *w;
uint32_t filter = e->filter;
void **handle = (void **)handle_p;
@@ -391,7 +392,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
DEBUG(10, ("inotify_add_watch for %s mask %x returned wd %d\n",
e->path, mask, wd));
- w = talloc(in, struct watch_context);
+ w = talloc(in, struct inotify_watch_context);
if (w == NULL) {
inotify_rm_watch(in->fd, wd);
e->filter = filter;