| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20081125172133.17115.96807.stgit@paris.rdu.redhat.com>
Date: Tue, 25 Nov 2008 12:21:33 -0500
From: Eric Paris <eparis@...hat.com>
To: linux-kernel@...r.kernel.org, malware-list@...ts.printk.net
Cc: viro@...iv.linux.org.uk, akpm@...ux-foundation.org,
alan@...rguk.ukuu.org.uk, arjan@...radead.org, hch@...radead.org,
a.p.zijlstra@...llo.nl
Subject: [PATCH -v3 8/8] dnotify: reimplement dnotify using fsnotify
Reimplement dnotify using fsnotify.
Signed-off-by: Eric Paris <eparis@...hat.com>
---
fs/notify/dnotify/Kconfig | 1
fs/notify/dnotify/dnotify.c | 334 +++++++++++++++++++++++++++++++++++--------
include/linux/dnotify.h | 21 +--
include/linux/fs.h | 5 -
include/linux/fsnotify.h | 45 +++---
5 files changed, 300 insertions(+), 106 deletions(-)
diff --git a/fs/notify/dnotify/Kconfig b/fs/notify/dnotify/Kconfig
index 26adf5d..904ff8d 100644
--- a/fs/notify/dnotify/Kconfig
+++ b/fs/notify/dnotify/Kconfig
@@ -1,5 +1,6 @@
config DNOTIFY
bool "Dnotify support"
+ depends on FSNOTIFY
default y
help
Dnotify is a directory-based per-fd file change notification system
diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 676073b..6908860 100644
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -21,24 +21,169 @@
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/fdtable.h>
+#include <linux/fsnotify_backend.h>
+
+#include "../fsnotify.h"
int dir_notify_enable __read_mostly = 1;
static struct kmem_cache *dn_cache __read_mostly;
-static void redo_inode_mask(struct inode *inode)
+static int inode_dir_notify(struct fsnotify_group *group, struct fsnotify_event *event);
+static void clear_mark_dir_notify(struct fsnotify_mark_entry *entry, struct inode *inode, unsigned long mask, unsigned int flags);
+static int should_send_event_dir_notify(struct fsnotify_group *group, struct inode *inode, unsigned long mask);
+
+static struct fsnotify_ops dnotify_fsnotify_ops = {
+ .event_to_notif = inode_dir_notify,
+ .mark_clear_inode = clear_mark_dir_notify,
+ .should_send_event = should_send_event_dir_notify,
+};
+
+static inline struct fsnotify_mark_entry *dnotify_get_mark(struct inode *inode)
+{
+ struct fsnotify_mark_entry *entry;
+ list_for_each_entry(entry, &inode->i_fsnotify_mark_entries, i_list) {
+ if (entry->group->ops == &dnotify_fsnotify_ops)
+ fsnotify_mark_get(entry);
+ return entry;
+ }
+ return NULL;
+}
+
+/* holding the fsnotify_mark_lock to protect the private data and the inode mask */
+static void dnotify_recalc_inode_mask(struct fsnotify_mark_entry *entry)
{
unsigned long new_mask;
struct dnotify_struct *dn;
new_mask = 0;
- for (dn = inode->i_dnotify; dn != NULL; dn = dn->dn_next)
- new_mask |= dn->dn_mask & ~DN_MULTISHOT;
- inode->i_dnotify_mask = new_mask;
+ dn = (struct dnotify_struct *)entry->private;
+ for (; dn != NULL; dn = dn->dn_next)
+ new_mask |= (dn->dn_mask & ~FS_DN_MULTISHOT);
+ entry->mask = new_mask;
+ fsnotify_recalc_inode_mask(entry->inode);
+}
+
+static int inode_dir_notify(struct fsnotify_group *group, struct fsnotify_event *event)
+{
+ struct fsnotify_mark_entry *entry = NULL;
+ struct inode *inode;
+ struct dnotify_struct *dn;
+ struct dnotify_struct **prev;
+ struct fown_struct *fown;
+ int changed = 0;
+
+ switch (event->flag) {
+ case FSNOTIFY_EVENT_INODE:
+ inode = event->inode;
+ break;
+ case FSNOTIFY_EVENT_PATH:
+ inode = event->path.dentry->d_inode;
+ break;
+ case FSNOTIFY_EVENT_DENTRY:
+ inode = event->dentry->d_inode;
+ break;
+ default:
+ BUG();
+ };
+
+ spin_lock(&inode->i_fsnotify_lock);
+
+ entry = dnotify_get_mark(inode);
+ /* unlikely since we alreay passed should_send_event_dir_notify() */
+ if (unlikely(!entry))
+ goto out_unlock;
+
+ prev = (struct dnotify_struct **)&entry->private;
+ while ((dn = *prev) != NULL) {
+ if ((dn->dn_mask & event->mask) == 0) {
+ prev = &dn->dn_next;
+ continue;
+ }
+ fown = &dn->dn_filp->f_owner;
+ send_sigio(fown, dn->dn_fd, POLL_MSG);
+ if (dn->dn_mask & FS_DN_MULTISHOT)
+ prev = &dn->dn_next;
+ else {
+ *prev = dn->dn_next;
+ changed = 1;
+ kmem_cache_free(dn_cache, dn);
+ }
+ }
+ if (changed)
+ dnotify_recalc_inode_mask(entry);
+
+out_unlock:
+ spin_unlock(&inode->i_fsnotify_lock);
+ if (entry)
+ fsnotify_mark_put(entry);
+
+ return 0;
+}
+
+static void clear_mark_dir_notify(struct fsnotify_mark_entry *entry, struct inode *inode, unsigned long mask __attribute__ ((unused)), unsigned int flags)
+{
+ struct dnotify_struct *dn;
+ struct dnotify_struct **prev;
+ struct fsnotify_group *dnotify_group;
+
+ /* if this isn't a dir it better not have dnotify marks */
+ BUG_ON(!S_ISDIR(inode->i_mode));
+
+ if (!(flags & FSNOTIFY_FORCE_CLEAR_MARK)) {
+ /* not a force just put it back */
+ list_move(&entry->i_list, &inode->i_fsnotify_mark_entries);
+ return;
+ }
+
+ /* everything should have been cleaned up before we got here. */
+ /* this could/should be a BUG(), but for now just be safe */
+ WARN(1, "A dnotify watch survived until the inode was evicted form cache!\n");
+
+ /* free our private data */
+ prev = (struct dnotify_struct **)&entry->private;
+ while ((dn = *prev) != NULL) {
+ *prev = dn->dn_next;
+ kmem_cache_free(dn_cache, dn);
+ }
+
+ dnotify_group = entry->group;
+ /* clean up both lists and mark the entry for free'ing */
+ fsnotify_kill_mark_inode(entry);
+ fsnotify_put_group(dnotify_group);
+}
+
+static int should_send_event_dir_notify(struct fsnotify_group *group, struct inode *inode, unsigned long mask)
+{
+ struct fsnotify_mark_entry *entry;
+ int send = 0;
+
+ /* !dir_notify_enable should never get here, don't waste time checking
+ if (!dir_notify_enable)
+ return 0; */
+
+ /* not a dir, dnotify doesn't care */
+ if (!S_ISDIR(inode->i_mode))
+ return 0;
+
+ spin_lock(&inode->i_fsnotify_lock);
+
+ /* no mark means no dnotify watch */
+ entry = dnotify_get_mark(inode);
+ if (!entry)
+ goto out;
+
+ send = !!(mask & entry->mask);
+ fsnotify_mark_put(entry);
+out:
+ spin_unlock(&inode->i_fsnotify_lock);
+ return send;
}
void dnotify_flush(struct file *filp, fl_owner_t id)
{
+ struct fsnotify_group *dnotify_group = NULL;
+ struct fsnotify_mark_entry *entry = NULL;
struct dnotify_struct *dn;
struct dnotify_struct **prev;
struct inode *inode;
@@ -46,22 +191,62 @@ void dnotify_flush(struct file *filp, fl_owner_t id)
inode = filp->f_path.dentry->d_inode;
if (!S_ISDIR(inode->i_mode))
return;
- spin_lock(&inode->i_lock);
- prev = &inode->i_dnotify;
+ spin_lock(&inode->i_fsnotify_lock);
+ entry = dnotify_get_mark(inode);
+ if (!entry)
+ goto out_unlock;
+
+ prev = (struct dnotify_struct **)&entry->private;
while ((dn = *prev) != NULL) {
if ((dn->dn_owner == id) && (dn->dn_filp == filp)) {
*prev = dn->dn_next;
- redo_inode_mask(inode);
+ dnotify_recalc_inode_mask(entry);
kmem_cache_free(dn_cache, dn);
break;
}
prev = &dn->dn_next;
}
- spin_unlock(&inode->i_lock);
+
+ /* last dnotify watch on this inode is gone */
+ if (entry->private == NULL) {
+ dnotify_group = entry->group;
+ fsnotify_kill_mark_inode(entry);
+ }
+out_unlock:
+ spin_unlock(&inode->i_fsnotify_lock);
+ if (entry)
+ fsnotify_mark_put(entry);
+ if (dnotify_group)
+ fsnotify_put_group(dnotify_group);
+}
+
+/* this conversion is done only at watch creation */
+static inline unsigned long convert_arg(unsigned long arg)
+{
+ unsigned long new_mask = 0;
+
+ if (arg & DN_MULTISHOT)
+ new_mask |= FS_DN_MULTISHOT;
+ if (arg & DN_DELETE)
+ new_mask |= (FS_DELETE | FS_DELETE_CHILD);
+ if (arg & DN_MODIFY)
+ new_mask |= (FS_MODIFY | FS_MODIFY_CHILD);
+ if (arg & DN_ACCESS)
+ new_mask |= (FS_ACCESS | FS_ACCESS_CHILD);
+ if (arg & DN_ATTRIB)
+ new_mask |= (FS_ATTRIB | FS_ATTRIB_CHILD);
+ if (arg & DN_RENAME)
+ new_mask |= FS_RENAME;
+ if (arg & DN_CREATE)
+ new_mask |= FS_CREATE;
+
+ return new_mask;
}
int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
{
+ struct fsnotify_group *dnotify_group;
+ struct fsnotify_mark_entry *entry;
struct dnotify_struct *dn;
struct dnotify_struct *odn;
struct dnotify_struct **prev;
@@ -69,27 +254,63 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
fl_owner_t id = current->files;
struct file *f;
int error = 0;
+ unsigned long mask;
+
+ if (!dir_notify_enable)
+ return -EINVAL;
if ((arg & ~DN_MULTISHOT) == 0) {
dnotify_flush(filp, id);
return 0;
}
- if (!dir_notify_enable)
- return -EINVAL;
inode = filp->f_path.dentry->d_inode;
if (!S_ISDIR(inode->i_mode))
return -ENOTDIR;
+
+ /* expect most fcntl to add new rather than augment old */
dn = kmem_cache_alloc(dn_cache, GFP_KERNEL);
if (dn == NULL)
return -ENOMEM;
- spin_lock(&inode->i_lock);
- prev = &inode->i_dnotify;
+
+ /* convert the userspace DN_* "arg" to the internal FS_* defines in fsnotify */
+ mask = convert_arg(arg);
+
+ /*
+ * I really don't like using ALL_DNOTIFY_EVENTS. We could probably do
+ * better setting the group->mask equal to only those dnotify watches care
+ * about, but removing events means running the entire group->mark_entries
+ * list to recalculate the mask. Also makes it harder to find the right
+ * group, but this is not a fast path, so harder doesn't mean bad.
+ * Maybe a future performance win since it could result in faster fsnotify()
+ * processing.
+ */
+ dnotify_group = fsnotify_find_group(INT_MAX, INT_MAX, ALL_DNOTIFY_EVENTS, &dnotify_fsnotify_ops);
+ /* screw it, i don't care */
+ if (IS_ERR(dnotify_group)) {
+ error = PTR_ERR(dnotify_group);
+ goto out_free;
+ }
+
+ /* if successful mark_add returns holding the inode->i_fsnotify_lock */
+ entry = fsnotify_mark_add(dnotify_group, inode, mask);
+ if (!entry) {
+ error = -ENOMEM;
+ goto out_put_group;
+ }
+ /* entry->private == NULL means that this is a new inode mark.
+ * take a group reference for it. */
+ if (entry->private == NULL)
+ fsnotify_get_group(dnotify_group);
+
+ prev = (struct dnotify_struct **)&entry->private;
while ((odn = *prev) != NULL) {
+ /* do we already have a dnotify struct and we are just adding more events? */
if ((odn->dn_owner == id) && (odn->dn_filp == filp)) {
odn->dn_fd = fd;
- odn->dn_mask |= arg;
- inode->i_dnotify_mask |= arg & ~DN_MULTISHOT;
- goto out_free;
+ odn->dn_mask |= mask;
+ /* recalculate the entry->mask and entry->inode->i_fsnotify_mask */
+ dnotify_recalc_inode_mask(entry);
+ goto out_unlock;
}
prev = &odn->dn_next;
}
@@ -98,65 +319,38 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
f = fcheck(fd);
rcu_read_unlock();
/* we'd lost the race with close(), sod off silently */
- /* note that inode->i_lock prevents reordering problems
- * between accesses to descriptor table and ->i_dnotify */
+ /* note that inode->i_fsnotify_lock prevents reordering problems
+ * between accesses to descriptor table and the private data in the
+ * inode mark */
if (f != filp)
- goto out_free;
+ goto out_unlock;
error = __f_setown(filp, task_pid(current), PIDTYPE_PID, 0);
if (error)
- goto out_free;
+ goto out_unlock;
- dn->dn_mask = arg;
+ dn->dn_mask = mask;
dn->dn_fd = fd;
dn->dn_filp = filp;
dn->dn_owner = id;
- inode->i_dnotify_mask |= arg & ~DN_MULTISHOT;
- dn->dn_next = inode->i_dnotify;
- inode->i_dnotify = dn;
- spin_unlock(&inode->i_lock);
-
- if (filp->f_op && filp->f_op->dir_notify)
- return filp->f_op->dir_notify(filp, arg);
+ dn->dn_next = entry->private;
+ entry->private = dn;
+ dnotify_recalc_inode_mask(entry);
+ spin_unlock(&inode->i_fsnotify_lock);
+ fsnotify_mark_put(entry);
+ fsnotify_put_group(dnotify_group);
return 0;
+out_unlock:
+ spin_unlock(&inode->i_fsnotify_lock);
+ fsnotify_mark_put(entry);
+out_put_group:
+ fsnotify_put_group(dnotify_group);
out_free:
- spin_unlock(&inode->i_lock);
kmem_cache_free(dn_cache, dn);
return error;
}
-void __inode_dir_notify(struct inode *inode, unsigned long event)
-{
- struct dnotify_struct * dn;
- struct dnotify_struct **prev;
- struct fown_struct * fown;
- int changed = 0;
-
- spin_lock(&inode->i_lock);
- prev = &inode->i_dnotify;
- while ((dn = *prev) != NULL) {
- if ((dn->dn_mask & event) == 0) {
- prev = &dn->dn_next;
- continue;
- }
- fown = &dn->dn_filp->f_owner;
- send_sigio(fown, dn->dn_fd, POLL_MSG);
- if (dn->dn_mask & DN_MULTISHOT)
- prev = &dn->dn_next;
- else {
- *prev = dn->dn_next;
- changed = 1;
- kmem_cache_free(dn_cache, dn);
- }
- }
- if (changed)
- redo_inode_mask(inode);
- spin_unlock(&inode->i_lock);
-}
-
-EXPORT_SYMBOL(__inode_dir_notify);
-
/*
* This is hopelessly wrong, but unfixable without API changes. At
* least it doesn't oops the kernel...
@@ -164,23 +358,35 @@ EXPORT_SYMBOL(__inode_dir_notify);
* To safely access ->d_parent we need to keep d_move away from it. Use the
* dentry's d_lock for this.
*/
-void dnotify_parent(struct dentry *dentry, unsigned long event)
+void dnotify_parent(struct dentry *dentry, unsigned long mask)
{
struct dentry *parent;
+ struct fsnotify_mark_entry *entry;
if (!dir_notify_enable)
return;
spin_lock(&dentry->d_lock);
parent = dentry->d_parent;
- if (parent->d_inode->i_dnotify_mask & event) {
+
+ if (!(parent->d_inode->i_fsnotify_mask & mask))
+ goto out_unlock;
+
+ entry = dnotify_get_mark(parent->d_inode);
+ if (!entry)
+ goto out_unlock;
+
+ if (entry->mask & mask) {
dget(parent);
spin_unlock(&dentry->d_lock);
- __inode_dir_notify(parent->d_inode, event);
+ fsnotify(NULL, parent, NULL, mask);
dput(parent);
- } else {
- spin_unlock(&dentry->d_lock);
}
+ fsnotify_mark_put(entry);
+ return;
+
+out_unlock:
+ spin_unlock(&dentry->d_lock);
}
EXPORT_SYMBOL_GPL(dnotify_parent);
diff --git a/include/linux/dnotify.h b/include/linux/dnotify.h
index 102a902..5fbb01c 100644
--- a/include/linux/dnotify.h
+++ b/include/linux/dnotify.h
@@ -21,23 +21,18 @@ struct dnotify_struct {
#ifdef CONFIG_DNOTIFY
-extern void __inode_dir_notify(struct inode *, unsigned long);
+#define ALL_DNOTIFY_EVENTS (FS_DELETE | FS_DELETE_CHILD |\
+ FS_MODIFY | FS_MODIFY_CHILD |\
+ FS_ACCESS | FS_ACCESS_CHILD |\
+ FS_ATTRIB | FS_ATTRIB_CHILD |\
+ FS_CREATE | FS_RENAME)
+
extern void dnotify_flush(struct file *, fl_owner_t);
extern int fcntl_dirnotify(int, struct file *, unsigned long);
extern void dnotify_parent(struct dentry *, unsigned long);
-static inline void inode_dir_notify(struct inode *inode, unsigned long event)
-{
- if (inode->i_dnotify_mask & (event))
- __inode_dir_notify(inode, event);
-}
-
#else
-static inline void __inode_dir_notify(struct inode *inode, unsigned long event)
-{
-}
-
static inline void dnotify_flush(struct file *filp, fl_owner_t id)
{
}
@@ -51,10 +46,6 @@ static inline void dnotify_parent(struct dentry *dentry, unsigned long event)
{
}
-static inline void inode_dir_notify(struct inode *inode, unsigned long event)
-{
-}
-
#endif /* CONFIG_DNOTIFY */
#endif /* __KERNEL __ */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index de1e477..3ada08d 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -670,11 +670,6 @@ struct inode {
spinlock_t i_fsnotify_lock; /* protect the entries list */
#endif
-#ifdef CONFIG_DNOTIFY
- unsigned long i_dnotify_mask; /* Directory notify events */
- struct dnotify_struct *i_dnotify; /* for directory notifications */
-#endif
-
#ifdef CONFIG_INOTIFY
struct list_head inotify_watches; /* watches on this inode */
struct mutex inotify_mutex; /* protects the watches list */
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index efd1d85..55703fb 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -14,6 +14,7 @@
#include <linux/dnotify.h>
#include <linux/inotify.h>
#include <linux/audit.h>
+#include <linux/fsnotify_backend.h>
/*
* fsnotify_d_instantiate - instantiate a dentry for inode
@@ -44,11 +45,11 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
struct inode *source = moved->d_inode;
u32 cookie = inotify_get_cookie();
- if (old_dir == new_dir)
- inode_dir_notify(old_dir, DN_RENAME);
- else {
- inode_dir_notify(old_dir, DN_DELETE);
- inode_dir_notify(new_dir, DN_CREATE);
+ if (old_dir == new_dir) {
+ fsnotify(NULL, NULL, old_dir, FS_RENAME);
+ } else {
+ fsnotify(NULL, NULL, old_dir, FS_DELETE);
+ fsnotify(NULL, NULL, new_dir, FS_CREATE);
}
if (isdir)
@@ -76,7 +77,7 @@ static inline void fsnotify_nameremove(struct dentry *dentry, int isdir)
{
if (isdir)
isdir = IN_ISDIR;
- dnotify_parent(dentry, DN_DELETE);
+ dnotify_parent(dentry, FS_DELETE_CHILD);
inotify_dentry_parent_queue_event(dentry, IN_DELETE|isdir, 0, dentry->d_name.name);
}
@@ -110,7 +111,7 @@ static inline void fsnotify_link_count(struct inode *inode)
*/
static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
{
- inode_dir_notify(inode, DN_CREATE);
+ fsnotify(NULL, NULL, inode, FS_CREATE);
inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name,
dentry->d_inode);
audit_inode_child(dentry->d_name.name, dentry, inode);
@@ -123,7 +124,7 @@ static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
*/
static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct dentry *new_dentry)
{
- inode_dir_notify(dir, DN_CREATE);
+ fsnotify(NULL, NULL, dir, FS_CREATE);
inotify_inode_queue_event(dir, IN_CREATE, 0, new_dentry->d_name.name,
inode);
fsnotify_link_count(inode);
@@ -135,7 +136,7 @@ static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct
*/
static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
{
- inode_dir_notify(inode, DN_CREATE);
+ fsnotify(NULL, NULL, inode, FS_CREATE);
inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0,
dentry->d_name.name, dentry->d_inode);
audit_inode_child(dentry->d_name.name, dentry, inode);
@@ -153,7 +154,7 @@ static inline void fsnotify_access(struct file *file)
if (S_ISDIR(inode->i_mode))
mask |= IN_ISDIR;
- dnotify_parent(dentry, DN_ACCESS);
+ dnotify_parent(dentry, FS_ACCESS_CHILD);
inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
}
@@ -170,7 +171,7 @@ static inline void fsnotify_modify(struct file *file)
if (S_ISDIR(inode->i_mode))
mask |= IN_ISDIR;
- dnotify_parent(dentry, DN_MODIFY);
+ dnotify_parent(dentry, FS_MODIFY_CHILD);
inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
}
@@ -183,7 +184,7 @@ static inline void fsnotify_open_exec(struct file *file)
struct dentry *dentry = file->f_path.dentry;
struct inode *inode = dentry->d_inode;
- dnotify_parent(dentry, DN_ACCESS);
+ dnotify_parent(dentry, FS_ACCESS_CHILD);
inotify_dentry_parent_queue_event(dentry, IN_ACCESS, 0, dentry->d_name.name);
inotify_inode_queue_event(inode, IN_ACCESS, 0, NULL, NULL);
}
@@ -244,40 +245,40 @@ static inline void fsnotify_xattr(struct dentry *dentry)
static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
{
struct inode *inode = dentry->d_inode;
- int dn_mask = 0;
+ int fs_dn_mask = 0;
u32 in_mask = 0;
if (ia_valid & ATTR_UID) {
in_mask |= IN_ATTRIB;
- dn_mask |= DN_ATTRIB;
+ fs_dn_mask |= FS_ATTRIB_CHILD;
}
if (ia_valid & ATTR_GID) {
in_mask |= IN_ATTRIB;
- dn_mask |= DN_ATTRIB;
+ fs_dn_mask |= FS_ATTRIB_CHILD;
}
if (ia_valid & ATTR_SIZE) {
in_mask |= IN_MODIFY;
- dn_mask |= DN_MODIFY;
+ fs_dn_mask |= FS_MODIFY_CHILD;
}
/* both times implies a utime(s) call */
if ((ia_valid & (ATTR_ATIME | ATTR_MTIME)) == (ATTR_ATIME | ATTR_MTIME))
{
in_mask |= IN_ATTRIB;
- dn_mask |= DN_ATTRIB;
+ fs_dn_mask |= FS_ATTRIB_CHILD;
} else if (ia_valid & ATTR_ATIME) {
in_mask |= IN_ACCESS;
- dn_mask |= DN_ACCESS;
+ fs_dn_mask |= FS_ACCESS_CHILD;
} else if (ia_valid & ATTR_MTIME) {
in_mask |= IN_MODIFY;
- dn_mask |= DN_MODIFY;
+ fs_dn_mask |= FS_MODIFY_CHILD;
}
if (ia_valid & ATTR_MODE) {
in_mask |= IN_ATTRIB;
- dn_mask |= DN_ATTRIB;
+ fs_dn_mask |= FS_ATTRIB_CHILD;
}
- if (dn_mask)
- dnotify_parent(dentry, dn_mask);
+ if (fs_dn_mask)
+ dnotify_parent(dentry, fs_dn_mask);
if (in_mask) {
if (S_ISDIR(inode->i_mode))
in_mask |= IN_ISDIR;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists