Skip to content

Commit

Permalink
fsnotify: add pr_debug throughout
Browse files Browse the repository at this point in the history
It can be hard to debug fsnotify since there are so few printks.  Use
pr_debug to allow for dynamic debugging.

Signed-off-by: Eric Paris <eparis@redhat.com>
  • Loading branch information
Eric Paris committed Jul 28, 2010
1 parent 80af258 commit 5ba08e2
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 0 deletions.
4 changes: 4 additions & 0 deletions fs/notify/fsnotify.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ static int send_to_group(struct fsnotify_group *group, struct inode *to_tell,
int data_is, u32 cookie, const unsigned char *file_name,
struct fsnotify_event **event)
{
pr_debug("%s: group=%p to_tell=%p mnt=%p mask=%x data=%p data_is=%d"
" cookie=%d event=%p\n", __func__, group, to_tell, mnt,
mask, data, data_is, cookie, *event);

if (!group->ops->should_send_event(group, to_tell, mnt, mask,
data, data_is))
return 0;
Expand Down
6 changes: 6 additions & 0 deletions fs/notify/inotify/inotify_fsnotify.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
struct fsnotify_event_private_data *fsn_event_priv;
int wd, ret;

pr_debug("%s: group=%p event=%p to_tell=%p mask=%x\n", __func__, group,
event, event->to_tell, event->mask);

to_tell = event->to_tell;

fsn_mark = fsnotify_find_inode_mark(group, to_tell);
Expand Down Expand Up @@ -151,6 +154,9 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
struct fsnotify_mark *fsn_mark;
bool send;

pr_debug("%s: group=%p inode=%p mask=%x data=%p data_type=%d\n",
__func__, group, inode, mask, data, data_type);

fsn_mark = fsnotify_find_inode_mark(group, inode);
if (!fsn_mark)
return false;
Expand Down
10 changes: 10 additions & 0 deletions fs/notify/inotify/inotify_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group,

event = fsnotify_peek_notify_event(group);

pr_debug("%s: group=%p event=%p\n", __func__, group, event);

if (event->name_len)
event_size += roundup(event->name_len + 1, event_size);

Expand Down Expand Up @@ -170,6 +172,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
size_t event_size = sizeof(struct inotify_event);
size_t name_len = 0;

pr_debug("%s: group=%p event=%p\n", __func__, group, event);

/* we get the inotify watch descriptor from the event private data */
spin_lock(&event->lock);
fsn_priv = fsnotify_remove_priv_from_event(group, event);
Expand Down Expand Up @@ -242,6 +246,8 @@ static ssize_t inotify_read(struct file *file, char __user *buf,
kevent = get_one_event(group, count);
mutex_unlock(&group->notification_mutex);

pr_debug("%s: group=%p kevent=%p\n", __func__, group, kevent);

if (kevent) {
ret = PTR_ERR(kevent);
if (IS_ERR(kevent))
Expand Down Expand Up @@ -286,6 +292,8 @@ static int inotify_release(struct inode *ignored, struct file *file)
struct fsnotify_group *group = file->private_data;
struct user_struct *user = group->inotify_data.user;

pr_debug("%s: group=%p\n", __func__, group);

fsnotify_clear_marks_by_group(group);

/* free this group, matching get was inotify_init->fsnotify_obtain_group */
Expand All @@ -309,6 +317,8 @@ static long inotify_ioctl(struct file *file, unsigned int cmd,
group = file->private_data;
p = (void __user *) arg;

pr_debug("%s: group=%p cmd=%u\n", __func__, group, cmd);

switch (cmd) {
case FIONREAD:
mutex_lock(&group->notification_mutex);
Expand Down
13 changes: 13 additions & 0 deletions fs/notify/notification.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ void fsnotify_put_event(struct fsnotify_event *event)
return;

if (atomic_dec_and_test(&event->refcnt)) {
pr_debug("%s: event=%p\n", __func__, event);

if (event->data_type == FSNOTIFY_EVENT_PATH)
path_put(&event->path);

Expand Down Expand Up @@ -146,6 +148,8 @@ int fsnotify_add_notify_event(struct fsnotify_group *group, struct fsnotify_even
struct list_head *list = &group->notification_list;
int rc = 0;

pr_debug("%s: group=%p event=%p priv=%p\n", __func__, group, event, priv);

/*
* There is one fsnotify_event_holder embedded inside each fsnotify_event.
* Check if we expect to be able to use that holder. If not alloc a new
Expand Down Expand Up @@ -222,6 +226,8 @@ struct fsnotify_event *fsnotify_remove_notify_event(struct fsnotify_group *group

BUG_ON(!mutex_is_locked(&group->notification_mutex));

pr_debug("%s: group=%p\n", __func__, group);

holder = list_first_entry(&group->notification_list, struct fsnotify_event_holder, event_list);

event = holder->event;
Expand Down Expand Up @@ -307,6 +313,8 @@ int fsnotify_replace_event(struct fsnotify_event_holder *old_holder,
SPINLOCK_NEW,
};

pr_debug("%s: old_event=%p new_event=%p\n", __func__, old_event, new_event);

/*
* if the new_event's embedded holder is in use someone
* screwed up and didn't give us a clean new event.
Expand Down Expand Up @@ -340,6 +348,8 @@ struct fsnotify_event *fsnotify_clone_event(struct fsnotify_event *old_event)
if (!event)
return NULL;

pr_debug("%s: old_event=%p new_event=%p\n", __func__, old_event, event);

memcpy(event, old_event, sizeof(*event));
initialize_event(event);

Expand Down Expand Up @@ -379,6 +389,9 @@ struct fsnotify_event *fsnotify_create_event(struct inode *to_tell, __u32 mask,
if (!event)
return NULL;

pr_debug("%s: event=%p to_tell=%p mask=%x data=%p data_type=%d\n",
__func__, event, to_tell, mask, data, data_type);

initialize_event(event);

if (name) {
Expand Down

0 comments on commit 5ba08e2

Please sign in to comment.