Attachment 146611 Details for Bug 218556 – Some printk() and a BUG_ON() to help track down unmount oops

[patch] Some printk() and a BUG_ON() to help track down unmount oops

0001-Add-some-printk-and-a-BUG_ON-statements-to-try-to-track-down-the.txt (text/plain), 3.01 KB, created by Michael Halcrow on 2007-01-25 19:52:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Halcrow

Created: 2007-01-25 19:52:24 UTC

Size: 3.01 KB

patch

obsolete

> fs/ecryptfs/dentry.c |    1 +
> fs/ecryptfs/file.c   |    5 +++++
> fs/ecryptfs/inode.c  |    6 ++++++
> fs/ecryptfs/mmap.c   |    4 ++++
> 4 files changed, 16 insertions(+), 0 deletions(-)
>
>diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c
>index 329efcd..cdb917d 100644
>--- a/fs/ecryptfs/dentry.c
>+++ b/fs/ecryptfs/dentry.c
>@@ -89,6 +89,7 @@ static void ecryptfs_d_release(struct dentry *dentry)
> 			ecryptfs_dentry_to_lower_mnt(dentry);
> 
> 		mntput(lower_mnt);
>+/* TODO: mutex_unlock(&lower_dentry->d_inode->i_mutex);? */
> 		dput(lower_dentry);
> 	}
> 	return;
>diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
>index bd969ad..563a155 100644
>--- a/fs/ecryptfs/file.c
>+++ b/fs/ecryptfs/file.c
>@@ -186,6 +186,7 @@ retry:
> 	buf.filldir_called = 0;
> 	buf.entries_written = 0;
> 	buf.err = 0;
>+	BUG_ON(mutex_is_locked(&lower_file->f_path.dentry->d_inode->i_mutex));
> 	rc = vfs_readdir(lower_file, ecryptfs_filldir, (void *)&buf);
> 	if (buf.err)
> 		rc = buf.err;
>@@ -376,9 +377,13 @@ ecryptfs_fsync(struct file *file, struct dentry *dentry, int datasync)
> 	int rc = -EINVAL;
> 
> 	if (lower_inode->i_fop->fsync) {
>+		printk(KERN_INFO "%s: Locking [0x%p]\n", __FUNCTION__,
>+		       lower_inode);
> 		mutex_lock(&lower_inode->i_mutex);
> 		rc = lower_inode->i_fop->fsync(lower_file, lower_dentry,
> 					       datasync);
>+		printk(KERN_INFO "%s: Unlocking [0x%p]\n", __FUNCTION__,
>+		       lower_inode);
> 		mutex_unlock(&lower_inode->i_mutex);
> 	}
> 	return rc;
>diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
>index cf02a66..9dc38c4 100644
>--- a/fs/ecryptfs/inode.c
>+++ b/fs/ecryptfs/inode.c
>@@ -38,18 +38,24 @@ static struct dentry *lock_parent(struct dentry *dentry)
> 	struct dentry *dir;
> 
> 	dir = dget(dentry->d_parent);
>+	printk(KERN_INFO "%s: Locking [0x%p]\n", __FUNCTION__,
>+	       dir->d_inode);
> 	mutex_lock(&(dir->d_inode->i_mutex));
> 	return dir;
> }
> 
> static void unlock_parent(struct dentry *dentry)
> {
>+	printk(KERN_INFO "%s: Unlocking [0x%p]\n", __FUNCTION__,
>+	       dentry->d_parent->d_inode);
> 	mutex_unlock(&(dentry->d_parent->d_inode->i_mutex));
> 	dput(dentry->d_parent);
> }
> 
> static void unlock_dir(struct dentry *dir)
> {
>+	printk(KERN_INFO "%s: Unlocking [0x%p]\n", __FUNCTION__,
>+	       dir->d_inode);
> 	mutex_unlock(&dir->d_inode->i_mutex);
> 	dput(dir);
> }
>diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
>index 1e5d2ba..92a4147 100644
>--- a/fs/ecryptfs/mmap.c
>+++ b/fs/ecryptfs/mmap.c
>@@ -659,6 +659,8 @@ static int ecryptfs_commit_write(struct file *file, struct page *page,
> 	inode = page->mapping->host;
> 	lower_inode = ecryptfs_inode_to_lower(inode);
> 	lower_file = ecryptfs_file_to_lower(file);
>+	printk(KERN_INFO "%s: Locking [0x%p]\n", __FUNCTION__,
>+	       lower_inode);
> 	mutex_lock(&lower_inode->i_mutex);
> 	crypt_stat = &ecryptfs_inode_to_private(file->f_path.dentry->d_inode)
> 				->crypt_stat;
>@@ -707,6 +709,8 @@ out:
> 		ClearPageUptodate(page);
> 	else
> 		SetPageUptodate(page);
>+	printk(KERN_INFO "%s: Unlocking [0x%p]\n", __FUNCTION__,
>+	       lower_inode);
> 	mutex_unlock(&lower_inode->i_mutex);
> 	return rc;
> }
>-- 
>1.4.4.4
>

Actions: View | Diff

Attachments on bug 218556: 146549 | 146611 | 146760