From: Dave Hansen <haveblue@us.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: viro@ftp.linux.org.uk, herbert@13thfloor.at, hch@infradead.org,
Dave Hansen <haveblue@us.ibm.com>
Subject: [PATCH 04/28] OCFS2 is screwy
Date: Tue, 01 Aug 2006 16:52:43 -0700 [thread overview]
Message-ID: <20060801235243.EA4890B4@localhost.localdomain> (raw)
In-Reply-To: <20060801235240.82ADCA42@localhost.localdomain>
OCFS2 plays some games with i_nlink. It modifies it a bunch in
its unlink function, but rolls back the changes if an error
occurs. So, we can't just assume that iput_final() will happen
whenever i_nlink hits 0 in ocfs's unlink().
Create a helper function to do the hard work of i_nlink hitting
zero, and use it in ocfs2.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---
lxc-dave/fs/libfs.c | 6 ++++++
lxc-dave/fs/ocfs2/namei.c | 8 +++++---
lxc-dave/include/linux/fs.h | 9 +++++++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff -puN fs/ocfs2/namei.c~ofcfs-is-screwy fs/ocfs2/namei.c
--- lxc/fs/ocfs2/namei.c~ofcfs-is-screwy 2006-08-01 16:35:15.000000000 -0700
+++ lxc-dave/fs/ocfs2/namei.c 2006-08-01 16:35:16.000000000 -0700
@@ -909,6 +909,8 @@ static int ocfs2_unlink(struct inode *di
leave:
if (status < 0 && saved_nlink)
inode->i_nlink = saved_nlink;
+ if (inode->i_nlink == 0)
+ __inode_set_awaiting_final_iput(inode);
if (handle)
ocfs2_commit_trans(handle);
@@ -1329,7 +1331,7 @@ static int ocfs2_rename(struct inode *ol
}
if (new_inode) {
- new_inode->i_nlink--;
+ inode_drop_nlink(new_inode);
new_inode->i_ctime = CURRENT_TIME;
}
old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME;
@@ -1340,9 +1342,9 @@ static int ocfs2_rename(struct inode *ol
PARENT_INO(old_inode_de_bh->b_data) =
cpu_to_le64(OCFS2_I(new_dir)->ip_blkno);
status = ocfs2_journal_dirty(handle, old_inode_de_bh);
- old_dir->i_nlink--;
+ inode_drop_nlink(old_dir);
if (new_inode) {
- new_inode->i_nlink--;
+ inode_drop_nlink(new_inode);
} else {
new_dir->i_nlink++;
mark_inode_dirty(new_dir);
diff -puN fs/libfs.c~ofcfs-is-screwy fs/libfs.c
--- lxc/fs/libfs.c~ofcfs-is-screwy 2006-08-01 16:35:15.000000000 -0700
+++ lxc-dave/fs/libfs.c 2006-08-01 16:35:16.000000000 -0700
@@ -270,6 +270,11 @@ out:
return ret;
}
+void __inode_set_awaiting_final_iput(struct inode *inode)
+{
+}
+EXPORT_SYMBOL_GPL(inode_drop_nlink);
+
int simple_unlink(struct inode *dir, struct dentry *dentry)
{
struct inode *inode = dentry->d_inode;
@@ -617,6 +622,7 @@ EXPORT_SYMBOL(simple_commit_write);
EXPORT_SYMBOL(simple_dir_inode_operations);
EXPORT_SYMBOL(simple_dir_operations);
EXPORT_SYMBOL(simple_empty);
+EXPORT_SYMBOL(__inode_set_awaiting_final_iput);
EXPORT_SYMBOL(d_alloc_name);
EXPORT_SYMBOL(simple_fill_super);
EXPORT_SYMBOL(simple_getattr);
diff -puN drivers/usb/core/inode.c~ofcfs-is-screwy drivers/usb/core/inode.c
diff -puN include/linux/fs.h~ofcfs-is-screwy include/linux/fs.h
--- lxc/include/linux/fs.h~ofcfs-is-screwy 2006-08-01 16:35:15.000000000 -0700
+++ lxc-dave/include/linux/fs.h 2006-08-01 16:35:16.000000000 -0700
@@ -1257,9 +1257,18 @@ static inline void inode_inc_link_count(
}
extern void __inode_set_awaiting_final_iput(struct inode *inode);
+static inline void inode_clear_nlink(struct inode *inode)
+{
+ if (inode->i_nlink)
+ __inode_set_awaiting_final_iput(inode);
+ inode->i_nlink = 0;
+}
+
static inline void inode_drop_nlink(struct inode *inode)
{
inode->i_nlink--;
+ if (!inode->i_nlink)
+ __inode_set_awaiting_final_iput(inode);
}
static inline void inode_dec_link_count(struct inode *inode)
_
next prev parent reply other threads:[~2006-08-02 0:01 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-01 23:52 [PATCH 00/28] Mount writer count and read-only bind mounts (v5) Dave Hansen
2006-08-01 23:52 ` [PATCH 01/28] prepare for write access checks: collapse if() Dave Hansen
2006-08-03 14:32 ` Christoph Hellwig
2006-08-01 23:52 ` [PATCH 02/28] r/o bind mount prepwork: move open_namei()'s vfs_create() Dave Hansen
2006-08-03 14:33 ` Christoph Hellwig
2006-08-01 23:52 ` [PATCH 03/28] unlink: monitor i_nlink Dave Hansen
2006-08-03 14:35 ` Christoph Hellwig
2006-08-01 23:52 ` Dave Hansen [this message]
2006-08-02 2:14 ` [PATCH 04/28] OCFS2 is screwy Mark Fasheh
2006-08-02 3:19 ` [PATCH 04/28] OCFS2 is (not) screwy Dave Hansen
2006-08-02 3:21 ` [PATCH 04/28] OCFS2 is screwy Dave Hansen
2006-08-02 4:34 ` Mark Fasheh
2006-08-03 0:20 ` Mark Fasheh
2006-08-04 21:01 ` [PATCH] clean up OCFS2 nlink handling Dave Hansen
2006-08-04 21:38 ` Mark Fasheh
2006-08-01 23:52 ` [PATCH 05/28] monitor zeroing of i_nlink Dave Hansen
2006-08-01 23:52 ` [PATCH 06/28] reintroduce list of vfsmounts over superblock Dave Hansen
2006-08-03 14:39 ` Christoph Hellwig
2006-08-04 21:47 ` Dave Hansen
2006-08-01 23:52 ` [PATCH 07/28] Add vfsmount writer count Dave Hansen
2006-08-01 23:52 ` [PATCH 09/28] kill open files traverse on remount ro Dave Hansen
2006-08-01 23:52 ` [PATCH 08/28] record when sb_writer_count elevated for inode Dave Hansen
2006-08-01 23:52 ` [PATCH 10/28] increment sb writer count when nlink hits zero Dave Hansen
2006-08-01 23:52 ` [PATCH 11/28] elevate writer count for chown and friends Dave Hansen
2006-08-01 23:52 ` [PATCH 12/28] elevate mnt writers for callers of vfs_mkdir() Dave Hansen
2006-08-01 23:52 ` [PATCH 13/28] elevate write count during entire ncp_ioctl() Dave Hansen
2006-08-01 23:52 ` [PATCH 14/28] sys_symlinkat() elevate write count around vfs_symlink() Dave Hansen
2006-08-01 23:52 ` [PATCH 15/28] elevate mount count for extended attributes Dave Hansen
2006-08-01 23:52 ` [PATCH 16/28] sys_linkat(): elevate write count around vfs_link() Dave Hansen
2006-08-01 23:52 ` [PATCH 18/28] unix_find_other() elevate write count for touch_atime() Dave Hansen
2006-08-01 23:52 ` [PATCH 17/28] mount_is_safe(): add comment Dave Hansen
2006-08-01 23:52 ` [PATCH 19/28] elevate write count over calls to vfs_rename() Dave Hansen
2006-08-01 23:52 ` [PATCH 20/28] tricky: elevate write count files are open()ed Dave Hansen
2006-08-01 23:52 ` [PATCH 21/28] elevate writer count for do_sys_truncate() Dave Hansen
2006-08-01 23:52 ` [PATCH 22/28] elevate write count for do_utimes() Dave Hansen
2006-08-01 23:52 ` [PATCH 23/28] elevate write count for do_sys_utime() and touch_atime() Dave Hansen
2006-08-01 23:52 ` [PATCH 24/28] sys_mknodat(): elevate write count for vfs_mknod/create() Dave Hansen
2006-08-01 23:52 ` [PATCH 25/28] elevate mnt writers for vfs_unlink() callers Dave Hansen
2006-08-01 23:52 ` [PATCH 26/28] do_rmdir(): elevate write count Dave Hansen
2006-08-01 23:53 ` [PATCH 27/28] elevate writer count for custom 'struct file' Dave Hansen
2006-08-03 14:42 ` Christoph Hellwig
2006-08-11 20:31 ` Dave Hansen
2006-08-01 23:53 ` [PATCH 28/28] honor r/w changes at do_remount() time Dave Hansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060801235243.EA4890B4@localhost.localdomain \
--to=haveblue@us.ibm.com \
--cc=hch@infradead.org \
--cc=herbert@13thfloor.at \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox