From e707c1d12874991d66c7fe6dbaf17d5d0bda74f3 Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli@redhat.com>
Date: Fri, 12 Oct 2012 21:30:54 -0400
Subject: [PATCH] Resolves: #865520   - Backport of upstream BZ #14251:
 powerpc: add name_to_handle,     open_by_handle, etc to PowerPC bits/fcntl.h.
 (#rh865520).

---
 glibc-rh865520.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++
 glibc.spec           |  8 +++++-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 glibc-rh865520.patch

diff --git a/glibc-rh865520.patch b/glibc-rh865520.patch
new file mode 100644
index 0000000..1a42610
--- /dev/null
+++ b/glibc-rh865520.patch
@@ -0,0 +1,59 @@
+commit c2b598a94512c5d754b25c77399032e87c1f2dd5
+Author: Khem Raj <raj.khem@gmail.com>
+Date:   Sat Sep 8 21:29:10 2012 -0700
+
+    powerpc: add name_to_handle_at, open_by_handle etc. to bits/fcntl.h
+    
+    Fixes BZ #14251.
+
+diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+index c984e2b..91797b7 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
++++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+@@ -1,5 +1,5 @@
+ /* O_*, F_*, FD_* bit values for Linux/PowerPC.
+-   Copyright (C) 1995-1998, 2000, 2003, 2004, 2006, 2007, 2009, 2010, 2011
++   Copyright (C) 1995-2012
+    Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+@@ -232,6 +232,19 @@ struct f_owner_ex
+ 					   we splice from/to).  */
+ # define SPLICE_F_MORE		4	/* Expect more data.  */
+ # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
++
++
++/* File handle structure.  */
++struct file_handle
++{
++  unsigned int handle_bytes;
++  int handle_type;
++  /* File identifier.  */
++  unsigned char f_handle[0];
++};
++
++/* Maximum handle size (for now).  */
++# define MAX_HANDLE_SZ  128
+ #endif
+ 
+ __BEGIN_DECLS
+@@ -278,6 +291,19 @@ extern int fallocate64 (int __fd, int __mode, __off64_t __offset,
+ 			__off64_t __len);
+ # endif
+ 
++
++/* Map file name to file handle.  */
++extern int name_to_handle_at (int __dfd, const char *__name,
++			      struct file_handle *__handle, int *__mnt_id,
++			      int __flags) __THROW;
++
++/* Open file using the file handle.
++
++   This function is a possible cancellation point and therefore not
++   marked with __THROW.  */
++extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
++			      int __flags);
++
+ #endif
+ 
+ __END_DECLS
diff --git a/glibc.spec b/glibc.spec
index 4ff47d2..df1fbf3 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 19%{?dist}
+Release: 20%{?dist}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -113,6 +113,7 @@ Patch1035: %{name}-rh845960.patch
 Patch1037: %{name}-rh849203.patch
 Patch1038: %{name}-rh805093.patch
 Patch1041: %{name}-rh848748.patch
+Patch1042: %{name}-rh865520.patch
 
 #
 # Patches submitted, but not yet approved upstream.
@@ -447,6 +448,7 @@ rm -rf %{glibcportsdir}
 %patch2040 -p1
 %patch1041 -p1
 %patch2042 -p1
+%patch1042 -p1
 
 # On powerpc32, hp timing is only available in power4/power6
 # libs, not in base, so pre-power4 dynamic linker is incompatible
@@ -1253,6 +1255,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Oct 12 2012 Patsy Franklin <pfrankli@redhat.com> - 2.16-20
+  - Backport of upstream BZ #14251: powerpc: add name_to_handle, 
+    open_by_handle, etc to PowerPC bits/fcntl.h. (#rh865520).
+
 * Wed Oct 10 2012 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.16-19
   - Fix Marathi names for Wednesday, September and October (#rh864820).