[Oracleasm-commits] jlbec commits r407 - in trunk: . kapi-compat/include kernel

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2009-01-07 13:53:12 -0800 (Wed, 07 Jan 2009)
New Revision: 407

Added:
   trunk/kapi-compat/include/current_creds.h
Modified:
   trunk/Makefile
   trunk/configure.in
   trunk/kernel/oracleasm.c
   trunk/kernel/transaction_file.c
Log:

oracleasm: Check for the credentials wrappers.

2.6.28 introduces wrapper functions to get a process's credentials.  Thus,
"current->fsuid" becomes "current_fsuid()".  Add the compatibility check.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-01-07 21:50:59 UTC (rev 406)
+++ trunk/Makefile	2009-01-07 21:53:12 UTC (rev 407)
@@ -21,6 +21,7 @@
 	kapi-compat/include/bio_map_user.h		\
 	kapi-compat/include/blkdev_get.h		\
 	kapi-compat/include/blkdev_put.h		\
+	kapi-compat/include/current_creds.h		\
 	kapi-compat/include/i_blksize.h			\
 	kapi-compat/include/i_mutex.h			\
 	kapi-compat/include/i_private.h			\

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-01-07 21:50:59 UTC (rev 406)
+++ trunk/configure.in	2009-01-07 21:53:12 UTC (rev 407)
@@ -268,6 +268,12 @@
 
   KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $slab_ctor_header"
 
+  current_creds_header=
+  OCFS2_CHECK_KERNEL_INCLUDES([current_fs?id() in cred.h], linux/cred.h,
+    $kernelincludes, , current_creds_header=current_creds.h,
+    [#define current_fsuid(])
+  KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $current_creds_header"
+
   # using -include has two advantages:
   #  the source doesn't need to know to include compat headers
   #  the compat header file names don't go through the search path

Added: trunk/kapi-compat/include/current_creds.h
===================================================================
--- trunk/kapi-compat/include/current_creds.h	                        (rev 0)
+++ trunk/kapi-compat/include/current_creds.h	2009-01-07 21:53:12 UTC (rev 407)
@@ -0,0 +1,7 @@
+#ifndef KAPI_CURRENT_CREDS_H
+#define KAPI_CURRENT_CREDS_H
+
+#define current_fsuid()         (current->fsuid)
+#define current_fsgid()         (current->fsgid)
+
+#endif /* KAPI_CURRENT_CREDS_H */

Modified: trunk/kernel/oracleasm.c
===================================================================
--- trunk/kernel/oracleasm.c	2009-01-07 21:50:59 UTC (rev 406)
+++ trunk/kernel/oracleasm.c	2009-01-07 21:53:12 UTC (rev 407)
@@ -563,8 +563,8 @@
 
 	inode->i_ino = (unsigned long)inode;
 	inode->i_mode = mode;
-	inode->i_uid = current->fsuid;
-	inode->i_gid = current->fsgid;
+	inode->i_uid = current_fsuid();
+	inode->i_gid = current_fsgid();
 	set_i_blksize(inode, PAGE_CACHE_SIZE);
 	inode->i_blocks = 0;
 	inode->i_rdev = 0;
@@ -597,8 +597,8 @@
 
 	inode->i_ino = (unsigned long)inode;
 	inode->i_mode = mode;
-	inode->i_uid = current->fsuid;
-	inode->i_gid = current->fsgid;
+	inode->i_uid = current_fsuid();
+	inode->i_gid = current_fsgid();
 	set_i_blksize(inode, PAGE_CACHE_SIZE);
 	inode->i_blocks = 0;
 	inode->i_rdev = 0;

Modified: trunk/kernel/transaction_file.c
===================================================================
--- trunk/kernel/transaction_file.c	2009-01-07 21:50:59 UTC (rev 406)
+++ trunk/kernel/transaction_file.c	2009-01-07 21:53:12 UTC (rev 407)
@@ -148,8 +148,8 @@
 	if (!inode)
 		return NULL;
 	inode->i_mode = S_IFREG | mode;
-	inode->i_uid = current->fsuid;
-	inode->i_gid = current->fsgid;
+	inode->i_uid = current_fsuid();
+	inode->i_gid = current_fsgid();
 	set_i_blksize(inode, PAGE_CACHE_SIZE);
 	inode->i_blocks = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;