Subject: [nacked] ocfs2-drop-the-unwanted-null-byte-in-dentry-lock-name.patch removed from -mm tree
To: joseph.qi@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 02 Dec 2013 13:39:30 -0800
The patch titled
Subject: ocfs2: drop the unwanted null byte in dentry lock name
has been removed from the -mm tree. Its filename was
ocfs2-drop-the-unwanted-null-byte-in-dentry-lock-name.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: Joseph Qi <joseph.qi@xxxxxxxxxx>
Subject: ocfs2: drop the unwanted null byte in dentry lock name
Dentry lock name is made up of the type 'N', the parent blkno and its
blkno represented as a binary value. Now there is a null byte between
parent blkno and the binary blkno value, so drop it.
Signed-off-by: Joseph Qi <joseph.qi@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dlm/dlmdebug.c | 2 +-
fs/ocfs2/dlmglue.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/ocfs2/dlm/dlmdebug.c~ocfs2-drop-the-unwanted-null-byte-in-dentry-lock-name fs/ocfs2/dlm/dlmdebug.c
--- a/fs/ocfs2/dlm/dlmdebug.c~ocfs2-drop-the-unwanted-null-byte-in-dentry-lock-name
+++ a/fs/ocfs2/dlm/dlmdebug.c
@@ -257,7 +257,7 @@ static int stringify_lockname(const char
#define OCFS2_DENTRY_LOCK_INO_START 18
if (*lockname == 'N') {
memcpy((__be64 *)&inode_blkno_be,
- (char *)&lockname[OCFS2_DENTRY_LOCK_INO_START],
+ (char *)&lockname[OCFS2_DENTRY_LOCK_INO_START - 1],
sizeof(__be64));
out += snprintf(buf + out, len - out, "%.*s%08x",
OCFS2_DENTRY_LOCK_INO_START - 1, lockname,
diff -puN fs/ocfs2/dlmglue.c~ocfs2-drop-the-unwanted-null-byte-in-dentry-lock-name fs/ocfs2/dlmglue.c
--- a/fs/ocfs2/dlmglue.c~ocfs2-drop-the-unwanted-null-byte-in-dentry-lock-name
+++ a/fs/ocfs2/dlmglue.c
@@ -586,7 +586,7 @@ static __u64 ocfs2_get_dentry_lock_ino(s
{
__be64 inode_blkno_be;
- memcpy(&inode_blkno_be, &lockres->l_name[OCFS2_DENTRY_LOCK_INO_START],
+ memcpy(&inode_blkno_be, &lockres->l_name[OCFS2_DENTRY_LOCK_INO_START - 1],
sizeof(__be64));
return be64_to_cpu(inode_blkno_be);
@@ -631,7 +631,7 @@ void ocfs2_dentry_lock_res_init(struct o
BUG_ON(len != (OCFS2_DENTRY_LOCK_INO_START - 1));
- memcpy(&lockres->l_name[OCFS2_DENTRY_LOCK_INO_START], &inode_blkno_be,
+ memcpy(&lockres->l_name[OCFS2_DENTRY_LOCK_INO_START - 1], &inode_blkno_be,
sizeof(__be64));
ocfs2_lock_res_init_common(OCFS2_SB(inode->i_sb), lockres,
_
Patches currently in -mm which might be from joseph.qi@xxxxxxxxxx are
ocfs2-free-allocated-clusters-if-error-occurs-after-ocfs2_claim_clusters.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
