LTTng 0.6.36 for 2.6.18 : debugfs fix
PATCH 1/16 LTTng 0.6.36 for 2.6.18 : debugfs fix
Patch against 2.6.19-rc6 already submitted to Greg Kroah-Hartman in tiny pieces for inclusion.
patch01-2.6.18-lttng-core-0.6.36-debugfs.diff
--BEGIN--
fs/debugfs/inode.c +30 -10
@@ -23,6 +23,7 @@ #include <linux/pagemap.h>#include <linux/init.h> #include <linux/namei.h> #include <linux/debugfs.h> +#include <linux/fsnotify.h> #define DEBUGFS_MAGIC 0x64626720
@@ -54,7 +55,8 @@ static struct inode *debugfs_get_inode(s inode->i_op = &simple_dir_inode_operations; inode->i_fop = &simple_dir_operations; -/* directory inodes start off with i_nlink == 2 (for "." entry) */ +/* directory inodes start off with i_nlink == 2 +* (for "." entry) */ inode->i_nlink++;break ; }
@@ -87,15 +89,22 @@ static int debugfs_mkdir(struct inode *d mode = (mode & (S_IRWXUGO |S_ISVTX )) |S_IFDIR ; res =debugfs_mknod (dir, dentry, mode,0 ); -if (!res) +if (!res) { dir->i_nlink++; +fsnotify_mkdir (dir, dentry); + }return res; }static int debugfs_create (struct inode *dir,struct dentry *dentry,int mode) { +int res; + mode = (mode &S_IALLUGO ) |S_IFREG ; -return debugfs_mknod (dir, dentry, mode,0 ); + res =debugfs_mknod (dir, dentry, mode,0 ); +if (!res) +fsnotify_create (dir, dentry); +return res; }static inline int debugfs_positive (struct dentry *dentry)
@@ -135,7 +144,7 @@ static int debugfs_create_by_name(const* block. A pointer to that is in the struct vfsmount that we * have around. */ -if (!parent ) { +if (!parent) {if (debugfs_mount && debugfs_mount->mnt_sb) { parent = debugfs_mount->mnt_sb->s_root; }
@@ -153,10 +162,10 @@ static int debugfs_create_by_name(const error =debugfs_mkdir (parent->d_inode, *dentry, mode); else error =debugfs_create (parent->d_inode, *dentry, mode); +dput (*dentry); }else error =PTR_ERR (dentry);mutex_unlock (&parent->d_inode->i_mutex); -return error; }
@@ -198,13 +207,15 @@ struct dentry *debugfs_create_file(constpr_debug ("debugfs: creating file '%s'\n" ,name); - error =simple_pin_fs (&debug_fs_type, &debugfs_mount, &debugfs_mount_count); + error =simple_pin_fs (&debug_fs_type, &debugfs_mount, + &debugfs_mount_count);if (error) goto exit; error =debugfs_create_by_name (name, mode, parent, &dentry);if (error) { dentry =NULL ; +simple_release_fs (&debugfs_mount, &debugfs_mount_count); goto exit; }
@@ -265,6 +276,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);void debugfs_remove (struct dentry *dentry) {struct dentry *parent; +int ret =0 ;if (!dentry)return ;
@@ -276,11 +288,19 @@ void debugfs_remove(struct dentry *dentrmutex_lock (&parent->d_inode->i_mutex);if (debugfs_positive (dentry)) {if (dentry->d_inode) { -if (S_ISDIR (dentry->d_inode->i_mode)) -simple_rmdir (parent->d_inode, dentry); -else +dget (dentry); +if (S_ISDIR (dentry->d_inode->i_mode)) { + ret =simple_rmdir (parent->d_inode, dentry); +if (ret) +printk (KERN_ERR +"DebugFS rmdir on %s failed : " +"directory not empty.\n" , + dentry->d_name.name); + }else simple_unlink (parent->d_inode, dentry); -dput (dentry); +if (!ret) +d_delete (dentry); +dput (dentry); } }mutex_unlock (&parent->d_inode->i_mutex);
--END--
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
Quoted 2 lines · Mathieu Desnoyers
Patch against 2.6.19-rc6 already submitted to Greg Kroah-Hartman in tiny pieces for inclusion.
This doesn't look like a single fix but rather like a few of them, and the description is rather lacking. But if Greg has already taken it we shouldn't worry..
Quoted 8 lines · * Christoph Hellwig ([email protected]) wrote:
Quoted 2 lines · Mathieu Desnoyers
Patch against 2.6.19-rc6 already submitted to Greg Kroah-Hartman in tiny pieces for inclusion.
This doesn't look like a single fix but rather like a few of them, and the description is rather lacking. But if Greg has already taken it we shouldn't worry..
Hi Christoph,
Yes, here it's in a single chunk so a functionnal LTTng can be sent to LKML in less than 20 posts. I submitted it in small chunks to Greg already, please see then following posts for the detail :
[PATCH 1/5] DebugFS : inotify create/mkdir support, 2.6.19-rc6
http://lkml.org/lkml/2006/11/24/121
[PATCH 2/5] DebugFS : coding style fixes, 2.6.19-rc6
http://lkml.org/lkml/2006/11/24/120
[PATCH 3/5] DebugFS : file/directory creation error handling, 2.6.19-rc6
http://lkml.org/lkml/2006/11/24/124
[PATCH 4/5] DebugFS : file/directory creation error handling, 2.6.19-rc6
http://lkml.org/lkml/2006/11/24/125
[PATCH 5/5] DebugFS : file/directory removal fix, 2.6.19-rc6
http://lkml.org/lkml/2006/11/24/126
Mathieu
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68