fix some build issues up in .27 patches

diff --git a/queue-2.6.27/coredump-suppress-uid-comparison-test-if-core-output-files-are-pipes.patch b/queue-2.6.27/coredump-suppress-uid-comparison-test-if-core-output-files-are-pipes.patch
index 344a3bdb7db177b41afc239dc0da7c843e24de18..e63e2c6e146888bbedc995e3a439a5484a785700 100644 (file)
--- a/queue-2.6.27/coredump-suppress-uid-comparison-test-if-core-output-files-are-pipes.patch
+++ b/queue-2.6.27/coredump-suppress-uid-comparison-test-if-core-output-files-are-pipes.patch
@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +       * Note, this is not relevant for pipes
         */
 -      if (inode->i_uid != current->fsuid)
-+      if (!ispipe && (inode->i_uid != current->fsuid()))
++      if (!ispipe && (inode->i_uid != current->fsuid))
                goto close_fail;
        if (!file->f_op)
                goto close_fail;

diff --git a/queue-2.6.27/tmpfs-cleanup-mpol_parse_str.patch b/queue-2.6.27/tmpfs-cleanup-mpol_parse_str.patch
index 1d31bb65e592a260909dc78f0508dc384fe3a3a9..c4b29b9c8666a1a911ddcca207b97d1bf58759f2 100644 (file)
--- a/queue-2.6.27/tmpfs-cleanup-mpol_parse_str.patch
+++ b/queue-2.6.27/tmpfs-cleanup-mpol_parse_str.patch
@@ -22,9 +22,13 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+---
+ mm/mempolicy.c |   18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
 --- a/mm/mempolicy.c
 +++ b/mm/mempolicy.c
-@@ -2195,8 +2195,8 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
+@@ -2029,8 +2029,8 @@ int mpol_parse_str(char *str, struct mem
                        char *rest = nodelist;
                        while (isdigit(*rest))
                                rest++;
@@ -35,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                }
                break;
        case MPOL_INTERLEAVE:
-@@ -2205,7 +2205,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
+@@ -2039,7 +2039,6 @@ int mpol_parse_str(char *str, struct mem
                 */
                if (!nodelist)
                        nodes = node_states[N_HIGH_MEMORY];
@@ -43,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                break;
        case MPOL_LOCAL:
                /*
-@@ -2214,7 +2213,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
+@@ -2048,7 +2047,6 @@ int mpol_parse_str(char *str, struct mem
                if (nodelist)
                        goto out;
                mode = MPOL_PREFERRED;
@@ -51,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                break;
        case MPOL_DEFAULT:
                /*
-@@ -2229,7 +2227,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
+@@ -2063,7 +2061,6 @@ int mpol_parse_str(char *str, struct mem
                 */
                if (!nodelist)
                        goto out;
@@ -59,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        }
  
        mode_flags = 0;
-@@ -2243,13 +2240,14 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
+@@ -2077,14 +2074,17 @@ int mpol_parse_str(char *str, struct mem
                else if (!strcmp(flags, "relative"))
                        mode_flags |= MPOL_F_RELATIVE_NODES;
                else
@@ -70,25 +74,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        new = mpol_new(mode, mode_flags, &nodes);
        if (IS_ERR(new))
 -              err = 1;
--      else {
+-      else if (no_context)
+-              new->w.user_nodemask = nodes;   /* save for contextualization */
 +              goto out;
-+
-+      {
-               int ret;
-               NODEMASK_SCRATCH(scratch);
-               if (scratch) {
-@@ -2260,13 +2258,15 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
-                       ret = -ENOMEM;
-               NODEMASK_SCRATCH_FREE(scratch);
-               if (ret) {
--                      err = 1;
-                       mpol_put(new);
--              } else if (no_context) {
--                      /* save for contextualization */
--                      new->w.user_nodemask = nodes;
-+                      goto out;
-               }
-       }
 +      err = 0;
 +      if (no_context) {
 +              /* save for contextualization */