]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.31/patches.fixes/ocfs2-Specify-appropriate-journal-access-for-new-xa.patch
Revert "Move xen patchset to new version's subdir."
[ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.fixes / ocfs2-Specify-appropriate-journal-access-for-new-xa.patch
diff --git a/src/patches/suse-2.6.27.31/patches.fixes/ocfs2-Specify-appropriate-journal-access-for-new-xa.patch b/src/patches/suse-2.6.27.31/patches.fixes/ocfs2-Specify-appropriate-journal-access-for-new-xa.patch
deleted file mode 100644 (file)
index 5678f62..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Joel Becker <joel.becker@oracle.com>
-Date: Mon, 20 Oct 2008 18:32:48 -0700
-Subject: ocfs2: Specify appropriate journal access for new xattr buckets.
-
-There are a couple places that get an xattr bucket that may be reading
-an existing one or may be allocating a new one.  They should specify the
-correct journal access mode depending.
-
-Signed-off-by: Joel Becker <joel.becker@oracle.com>
-Signed-off-by: Mark Fasheh <mfasheh@suse.com>
----
- fs/ocfs2/xattr.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-Index: linux-2.6.27-ocfs2/fs/ocfs2/xattr.c
-===================================================================
---- linux-2.6.27-ocfs2.orig/fs/ocfs2/xattr.c
-+++ linux-2.6.27-ocfs2/fs/ocfs2/xattr.c
-@@ -3231,7 +3231,9 @@ static int ocfs2_half_xattr_bucket(struc
-       for (i = 0; i < blk_per_bucket; i++) {
-               ret = ocfs2_journal_access(handle, inode, t_bhs[i],
--                                         OCFS2_JOURNAL_ACCESS_CREATE);
-+                                         new_bucket_head ?
-+                                         OCFS2_JOURNAL_ACCESS_CREATE :
-+                                         OCFS2_JOURNAL_ACCESS_WRITE);
-               if (ret) {
-                       mlog_errno(ret);
-                       goto out;
-@@ -3393,6 +3395,8 @@ static int ocfs2_cp_xattr_bucket(struct
-       for (i = 0; i < blk_per_bucket; i++) {
-               ret = ocfs2_journal_access(handle, inode, t_bhs[i],
-+                                         t_is_new ?
-+                                         OCFS2_JOURNAL_ACCESS_CREATE :
-                                          OCFS2_JOURNAL_ACCESS_WRITE);
-               if (ret)
-                       goto out;