Subject: [folded-merged] ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix-2.patch removed from -mm tree
To: jeff.liu@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,shencanquan@xxxxxxxxxx,sunil.mushran@xxxxxxxxx,younger.liu@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 03 Jul 2013 14:22:28 -0700
The patch titled
Subject: ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix-2
has been removed from the -mm tree. Its filename was
ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix-2.patch
This patch was dropped because it was folded into ocfs2-fix-readonly-issue-in-ocfs2_unlink.patch
------------------------------------------------------
From: Jeff Liu <jeff.liu@xxxxxxxxxx>
Subject: ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix-2
s/inode_is_unlinkable/ocfs2_inode_is_unlinkable/
Cc: Jensen <shencanquan@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Sunil Mushran <sunil.mushran@xxxxxxxxx>
Cc: Younger Liu <younger.liu@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/namei.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/ocfs2/namei.c~ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix-2 fs/ocfs2/namei.c
--- a/fs/ocfs2/namei.c~ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix-2
+++ a/fs/ocfs2/namei.c
@@ -773,7 +773,7 @@ static int ocfs2_remote_dentry_delete(st
return ret;
}
-static inline int inode_is_unlinkable(struct inode *inode)
+static inline int ocfs2_inode_is_unlinkable(struct inode *inode)
{
if (S_ISDIR(inode->i_mode)) {
if (inode->i_nlink == 2)
@@ -866,7 +866,7 @@ static int ocfs2_unlink(struct inode *di
goto leave;
}
- if (inode_is_unlinkable(inode)) {
+ if (ocfs2_inode_is_unlinkable(inode)) {
status = ocfs2_prepare_orphan_dir(osb, &orphan_dir,
OCFS2_I(inode)->ip_blkno,
orphan_name, &orphan_insert);
_
Patches currently in -mm which might be from jeff.liu@xxxxxxxxxx are
origin.patch
ocfs2-should-not-use-le32_add_cpu-to-set-ocfs2_dinode-i_flags.patch
ocfs2-add-missing-dlm_put-in-dlm_begin_reco_handler.patch
ocfs2-remove-unecessary-variable-needs_checkpoint.patch
ocfs2-fix-mutex_unlock-and-possible-memory-leak-in-ocfs2_remove_btree_range.patch
fs-ocfs2-journalh-add-bits_wanted-while-calculating-credits-in-ocfs2_calc_extend_credits.patch
fs-ocfs2-cluster-tcpc-free-sc-sc_page-in-sc_kref_release.patch
ocfs2-xattr-remove-useless-free-space-checking.patch
ocfs2-dlmlock_master-should-return-dlm_normal-after-adding-lock-to-blocked-list.patch
ocfs2-need-rollback-when-journal_access-failed-in-ocfs2_orphan_add.patch
ocfs2-rework-transaction-rollback-in-ocfs2_relink_block_group.patch
ocfs2-rework-transaction-rollback-in-ocfs2_relink_block_group-fix.patch
ocfs2-fix-readonly-issue-in-ocfs2_unlink.patch
ocfs2-xattr-fix-inlined-xattr-reflink.patch
ocfs2-submit-disk-heartbeat-bio-using-write_sync.patch
ocfs2-consolidate-o2hb_global_hearbeat_mode_set-naming-convention.patch
ocfs2-fix-a-comments-typo-at-o2quo_hb_still_up.patch
ocfs2-adjust-switch_case-syntax-at-o2net_state_change.patch
ocfs2-adjust-switch_case-syntax-at-o2net_state_change-fix.patch
ocfs2-fix-null-pointer-dereference-when-tranverse-o2hb_all_regions.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
