LINUX: Build fixes for older kernels

Error and warning fixes for older kernels in osi_compat.h:

 - In afs_posix_test_lock, remove the assignment in the conditional to
   silence a warning

 - Call getsockopt for kernel_getsockopt, instead of setsockopt

 - Missing end brace in afs_try_to_freeze

 - Prototype find_exported_dentry, since Linux doesn't give us one

Reviewed-on: http://gerrit.openafs.org/2946
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit e279ae77a7e9babcace78b67c40ccc959161d77a)
Change-Id: If61e12ea02d90980f2ec4b9503a26aff841161f6
Reviewed-on: http://gerrit.openafs.org/3060

diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
index 730147e3eb4ef638c78df062f2f6273f0ab97a0d..2ffef0fcaf5e2da1b51458d36b32098d1d0b83af 100644 (file)
--- a/src/afs/LINUX/osi_compat.h
+++ b/src/afs/LINUX/osi_compat.h
@@ -46,7 +46,8 @@ afs_posix_test_lock(struct file *fp, struct file_lock *flp) {
     }
 #elif defined(POSIX_TEST_LOCK_RETURNS_CONFLICT)
     struct file_lock *conflict;
-    if (conflict = posix_test_lock(fp, flp)) {
+    conflict = posix_test_lock(fp, flp);
+    if (conflict) {
        locks_copy_lock(flp, conflict);
        flp->fl_type = F_UNLCK;
     }
@@ -257,7 +258,7 @@ kernel_getsockopt(struct socket *sockp, int level, int name, char *val,
     int ret;
 
     set_fs(get_ds());
-    ret = sockp->ops->setsockopt(sockp, level, name, val, len);
+    ret = sockp->ops->getsockopt(sockp, level, name, val, len);
     set_fs(old_fs);
 
     return ret;
@@ -279,6 +280,7 @@ afs_try_to_freeze(void) {
 # ifdef CONFIG_PM
     if (current->flags & PF_FREEZE) {
        refrigerator(PF_FREEZE);
+    }
 # endif
 }
 #endif
@@ -338,8 +340,17 @@ afs_init_sb_export_ops(struct super_block *sb) {
      * decode_fh will call this function.  If not defined for this FS, make
      * sure it points to the default
      */
-    if (!sb->s_export_op->find_exported_dentry)
+    if (!sb->s_export_op->find_exported_dentry) {
+       /* Some kernels (at least 2.6.9) do not prototype find_exported_dentry,
+        * even though it is exported, so prototype it ourselves. Newer
+        * kernels do prototype it, but as long as our protoype matches the
+        * real one (the signature never changed before NEW_EXPORT_OPS came
+        * into play), there should be no problems. */
+       extern struct dentry * find_exported_dentry(struct super_block *sb, void *obj, void *parent,
+                                                   int (*acceptable)(void *context, struct dentry *de),
+                                                   void *context);
        sb->s_export_op->find_exported_dentry = find_exported_dentry;
+    }
 #endif
 }