From 7cb8982cbbe8298cd1bdd35055f7d3818f4a136f Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amar@gluster.com>
Date: Wed, 7 Apr 2010 04:19:48 +0000
Subject: backword compatibility with 3.0.x releases - restored

* glusterfs.h - added back the removed 'fop' types in same order
* call-stub.c - enhanced logging in case of failure
* server-protocol.c - added a ENOSYS function for these fops, so
                      there will be no crash if a old client
                      connects to mainline server.

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 734 (keep only the working/usable code in build tree to focus more on development)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=734
---
 libglusterfs/src/call-stub.c | 40 ++++++++++++++++------------------------
 libglusterfs/src/glusterfs.h |  5 +++++
 2 files changed, 21 insertions(+), 24 deletions(-)

(limited to 'libglusterfs')

diff --git a/libglusterfs/src/call-stub.c b/libglusterfs/src/call-stub.c
index ae67f59dc..5f73d9d6e 100644
--- a/libglusterfs/src/call-stub.c
+++ b/libglusterfs/src/call-stub.c
@@ -2553,11 +2553,11 @@ call_resume_wind (call_stub_t *stub)
         }
 	default:
 	{
-		gf_log ("call-stub",
-			GF_LOG_DEBUG,
-			"Invalid value of FOP");
+		gf_log ("call-stub", GF_LOG_ERROR, "Invalid value of FOP (%d)",
+                        stub->fop);
+                break;
 	}
-	break;
+
 	}
 out:
 	return;
@@ -3371,13 +3371,12 @@ call_resume_unwind (call_stub_t *stub)
                                 &stub->args.fsetattr_cbk.statpost);
                 break;
         }
-	case GF_FOP_MAXVALUE:
+        default:
 	{
-		gf_log ("call-stub",
-			GF_LOG_DEBUG,
-			"Invalid value of FOP");
+		gf_log ("call-stub", GF_LOG_ERROR, "Invalid value of FOP (%d)",
+                        stub->fop);
+                break;
 	}
-	break;
 	}
 out:
 	return;
@@ -3681,15 +3680,12 @@ call_stub_destroy_wind (call_stub_t *stub)
                         fd_unref (stub->args.fsetattr.fd);
                 break;
         }
-	case GF_FOP_MAXVALUE:
+        default:
 	{
-		gf_log ("call-stub",
-			GF_LOG_DEBUG,
-			"Invalid value of FOP");
+		gf_log ("call-stub", GF_LOG_ERROR, "Invalid value of FOP (%d)",
+                        stub->fop);
+                break;
 	}
-	break;
-	default:
-		break;
 	}
 }
 
@@ -3914,16 +3910,12 @@ call_stub_destroy_unwind (call_stub_t *stub)
                 break;
         }
 
-	case GF_FOP_MAXVALUE:
+        default:
 	{
-		gf_log ("call-stub",
-			GF_LOG_DEBUG,
-			"Invalid value of FOP");
+		gf_log ("call-stub", GF_LOG_ERROR, "Invalid value of FOP (%d)",
+                        stub->fop);
+                break;
 	}
-	break;
-
-	default:
-		break;
 	}
 }
 
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h
index cf87af7d3..5906b71ed 100644
--- a/libglusterfs/src/glusterfs.h
+++ b/libglusterfs/src/glusterfs.h
@@ -100,6 +100,7 @@ typedef enum {
         GF_FOP_GETXATTR,
         GF_FOP_REMOVEXATTR,/* 20 */
         GF_FOP_OPENDIR,
+        GF_FOP_GETDENTS,
         GF_FOP_FSYNCDIR,
         GF_FOP_ACCESS,
         GF_FOP_CREATE,     /* 25 */
@@ -107,6 +108,7 @@ typedef enum {
         GF_FOP_FSTAT,
         GF_FOP_LK,
         GF_FOP_LOOKUP,
+        GF_FOP_SETDENTS,
         GF_FOP_READDIR,
         GF_FOP_INODELK,   /* 35 */
         GF_FOP_FINODELK,
@@ -115,6 +117,8 @@ typedef enum {
         GF_FOP_CHECKSUM,
         GF_FOP_XATTROP,  /* 40 */
         GF_FOP_FXATTROP,
+        GF_FOP_LOCK_NOTIFY,
+        GF_FOP_LOCK_FNOTIFY,
         GF_FOP_FGETXATTR,
         GF_FOP_FSETXATTR, /* 45 */
         GF_FOP_RCHECKSUM,
@@ -128,6 +132,7 @@ typedef enum {
 typedef enum {
         GF_MOP_SETVOLUME, /* 0 */
         GF_MOP_GETVOLUME, /* 1 */
+        GF_MOP_STATS,
         GF_MOP_SETSPEC,
         GF_MOP_GETSPEC,
 	GF_MOP_PING,      /* 5 */
-- 
cgit