Commit 858da7e4 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

aufs: v5.2-rc1, file_name param of fsnotify_ops->handle_event


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent c1509cec
...@@ -149,13 +149,12 @@ static void au_hfsn_free_group(struct fsnotify_group *group) ...@@ -149,13 +149,12 @@ static void au_hfsn_free_group(struct fsnotify_group *group)
static int au_hfsn_handle_event(struct fsnotify_group *group, static int au_hfsn_handle_event(struct fsnotify_group *group,
struct inode *inode, struct inode *inode,
u32 mask, const void *data, int data_type, u32 mask, const void *data, int data_type,
const unsigned char *file_name, u32 cookie, const struct qstr *file_name, u32 cookie,
struct fsnotify_iter_info *iter_info) struct fsnotify_iter_info *iter_info)
{ {
int err; int err;
struct au_hnotify *hnotify; struct au_hnotify *hnotify;
struct inode *h_dir, *h_inode; struct inode *h_dir, *h_inode;
struct qstr h_child_qstr = QSTR_INIT(file_name, strlen(file_name));
struct fsnotify_mark *inode_mark; struct fsnotify_mark *inode_mark;
AuDebugOn(data_type != FSNOTIFY_EVENT_INODE); AuDebugOn(data_type != FSNOTIFY_EVENT_INODE);
...@@ -183,7 +182,7 @@ static int au_hfsn_handle_event(struct fsnotify_group *group, ...@@ -183,7 +182,7 @@ static int au_hfsn_handle_event(struct fsnotify_group *group,
inode_mark = fsnotify_iter_inode_mark(iter_info); inode_mark = fsnotify_iter_inode_mark(iter_info);
AuDebugOn(!inode_mark); AuDebugOn(!inode_mark);
hnotify = container_of(inode_mark, struct au_hnotify, hn_mark); hnotify = container_of(inode_mark, struct au_hnotify, hn_mark);
err = au_hnotify(h_dir, hnotify, mask, &h_child_qstr, h_inode); err = au_hnotify(h_dir, hnotify, mask, file_name, h_inode);
out: out:
return err; return err;
......
...@@ -535,7 +535,7 @@ out: ...@@ -535,7 +535,7 @@ out:
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask, int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
struct qstr *h_child_qstr, struct inode *h_child_inode) const struct qstr *h_child_qstr, struct inode *h_child_inode)
{ {
int err, len; int err, len;
unsigned int flags[AuHnLast], f; unsigned int flags[AuHnLast], f;
......
...@@ -600,7 +600,7 @@ void au_hn_free(struct au_hinode *hinode); ...@@ -600,7 +600,7 @@ void au_hn_free(struct au_hinode *hinode);
void au_hn_ctl(struct au_hinode *hinode, int do_set); void au_hn_ctl(struct au_hinode *hinode, int do_set);
void au_hn_reset(struct inode *inode, unsigned int flags); void au_hn_reset(struct inode *inode, unsigned int flags);
int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask, int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
struct qstr *h_child_qstr, struct inode *h_child_inode); const struct qstr *h_child_qstr, struct inode *h_child_inode);
int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm); int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm);
int au_hnotify_init_br(struct au_branch *br, int perm); int au_hnotify_init_br(struct au_branch *br, int perm);
void au_hnotify_fin_br(struct au_branch *br); void au_hnotify_fin_br(struct au_branch *br);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment