From: Chris Wright Date: Tue, 6 Mar 2007 00:56:59 +0000 (-0800) Subject: Added ocfs fix from Mark Fasheh X-Git-Tag: v2.6.20.2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9933c09e4123ff1c39ec1acc0f0f46f9bef80a8;p=thirdparty%2Fkernel%2Fstable-queue.git Added ocfs fix from Mark Fasheh --- diff --git a/queue-2.6.20/ocfs2-ocfs2_link-journal-credits-update.patch b/queue-2.6.20/ocfs2-ocfs2_link-journal-credits-update.patch new file mode 100644 index 00000000000..8b4c91cc731 --- /dev/null +++ b/queue-2.6.20/ocfs2-ocfs2_link-journal-credits-update.patch @@ -0,0 +1,32 @@ +From stable-bounces@linux.kernel.org Mon Mar 5 16:36:54 2007 +Date: Mon, 5 Mar 2007 16:34:11 -0800 +From: Mark Fasheh +To: stable@kernel.org +Message-ID: <20070306003411.GA28308@ca-server1.us.oracle.com> +Subject: ocfs2: ocfs2_link() journal credits update + +Commit 592282cf2eaa33409c6511ddd3f3ecaa57daeaaa fixed some missing directory +c/mtime updates in part by introducing a dinode update in ocfs2_add_entry(). +Unfortunately, ocfs2_link() (which didn't update the directory inode before) +is now missing a single journal credit. Fix this by doubling the number of +inode updates expected during hard link creation. + +Signed-off-by: Mark Fasheh +Signed-off-by: Chris Wright +--- + fs/ocfs2/journal.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.20.1.orig/fs/ocfs2/journal.h ++++ linux-2.6.20.1/fs/ocfs2/journal.h +@@ -306,8 +306,8 @@ int ocfs2_journal_dirty + * for the dinode, one for the new block. */ + #define OCFS2_SIMPLE_DIR_EXTEND_CREDITS (2) + +-/* file update (nlink, etc) + dir entry block */ +-#define OCFS2_LINK_CREDITS (OCFS2_INODE_UPDATE_CREDITS + 1) ++/* file update (nlink, etc) + directory mtime/ctime + dir entry block */ ++#define OCFS2_LINK_CREDITS (2*OCFS2_INODE_UPDATE_CREDITS + 1) + + /* inode + dir inode (if we unlink a dir), + dir entry block + orphan + * dir inode link */ diff --git a/queue-2.6.20/series b/queue-2.6.20/series new file mode 100644 index 00000000000..fba531ed10d --- /dev/null +++ b/queue-2.6.20/series @@ -0,0 +1 @@ +ocfs2-ocfs2_link-journal-credits-update.patch