linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / lockd / xdr.c

diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 5d4b339..200fbda 100644 (file)
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -44,7 +44,7 @@ loff_t_to_s32(loff_t offset)
 /*
  * XDR functions for basic NLM types
  */
-static inline u32 *nlm_decode_cookie(u32 *p, struct nlm_cookie *c)
+static u32 *nlm_decode_cookie(u32 *p, struct nlm_cookie *c)
 {
        unsigned int    len;
 
@@ -55,16 +55,16 @@ static inline u32 *nlm_decode_cookie(u32 *p, struct nlm_cookie *c)
                c->len=4;
                memset(c->data, 0, 4);  /* hockeypux brain damage */
        }
-       else if(len<=8)
+       else if(len<=NLM_MAXCOOKIELEN)
        {
                c->len=len;
                memcpy(c->data, p, len);
-               p+=(len+3)>>2;
+               p+=XDR_QUADLEN(len);
        }
        else 
        {
                printk(KERN_NOTICE
-                       "lockd: bad cookie size %d (only cookies under 8 bytes are supported.)\n", len);
+                       "lockd: bad cookie size %d (only cookies under %d bytes are supported.)\n", len, NLM_MAXCOOKIELEN);
                return NULL;
        }
        return p;
@@ -75,18 +75,18 @@ nlm_encode_cookie(u32 *p, struct nlm_cookie *c)
 {
        *p++ = htonl(c->len);
        memcpy(p, c->data, c->len);
-       p+=(c->len+3)>>2;
+       p+=XDR_QUADLEN(c->len);
        return p;
 }
 
-static inline u32 *
+static u32 *
 nlm_decode_fh(u32 *p, struct nfs_fh *f)
 {
        unsigned int    len;
 
        if ((len = ntohl(*p++)) != NFS2_FHSIZE) {
                printk(KERN_NOTICE
-                       "lockd: bad fhandle size %x (should be %d)\n",
+                       "lockd: bad fhandle size %d (should be %d)\n",
                        len, NFS2_FHSIZE);
                return NULL;
        }
@@ -119,7 +119,7 @@ nlm_encode_oh(u32 *p, struct xdr_netobj *oh)
        return xdr_encode_netobj(p, oh);
 }
 
-static inline u32 *
+static u32 *
 nlm_decode_lock(u32 *p, struct nlm_lock *lock)
 {
        struct file_lock        *fl = &lock->fl;
@@ -190,7 +190,7 @@ nlm_encode_testres(u32 *p, struct nlm_res *resp)
        s32             start, len;
 
        if (!(p = nlm_encode_cookie(p, &resp->cookie)))
-               return 0;
+               return NULL;
        *p++ = resp->status;
 
        if (resp->status == nlm_lck_denied) {
@@ -201,7 +201,7 @@ nlm_encode_testres(u32 *p, struct nlm_res *resp)
 
                /* Encode owner handle. */
                if (!(p = xdr_encode_netobj(p, &resp->lock.oh)))
-                       return 0;
+                       return NULL;
 
                start = loff_t_to_s32(fl->fl_start);
                if (fl->fl_end == OFFSET_MAX)
@@ -512,11 +512,11 @@ nlmclt_decode_res(struct rpc_rqst *req, u32 *p, struct nlm_res *resp)
  * Buffer requirements for NLM
  */
 #define NLM_void_sz            0
-#define NLM_cookie_sz          3       /* 1 len , 2 data */
-#define NLM_caller_sz          1+QUADLEN(sizeof(system_utsname.nodename))
-#define NLM_netobj_sz          1+QUADLEN(XDR_MAX_NETOBJ)
-/* #define NLM_owner_sz                1+QUADLEN(NLM_MAXOWNER) */
-#define NLM_fhandle_sz         1+QUADLEN(NFS2_FHSIZE)
+#define NLM_cookie_sz          1+XDR_QUADLEN(NLM_MAXCOOKIELEN)
+#define NLM_caller_sz          1+XDR_QUADLEN(sizeof(system_utsname.nodename))
+#define NLM_netobj_sz          1+XDR_QUADLEN(XDR_MAX_NETOBJ)
+/* #define NLM_owner_sz                1+XDR_QUADLEN(NLM_MAXOWNER) */
+#define NLM_fhandle_sz         1+XDR_QUADLEN(NFS2_FHSIZE)
 #define NLM_lock_sz            3+NLM_caller_sz+NLM_netobj_sz+NLM_fhandle_sz
 #define NLM_holder_sz          4+NLM_netobj_sz
 
@@ -604,3 +604,32 @@ struct rpc_program         nlm_program = {
                .stats          = &nlm_stats,
 };
 
+#ifdef RPC_DEBUG
+const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie)
+{
+       /*
+        * We can get away with a static buffer because we're only
+        * called with BKL held.
+        */
+       static char buf[2*NLM_MAXCOOKIELEN+1];
+       int i;
+       int len = sizeof(buf);
+       char *p = buf;
+
+       len--;  /* allow for trailing \0 */
+       if (len < 3)
+               return "???";
+       for (i = 0 ; i < cookie->len ; i++) {
+               if (len < 2) {
+                       strcpy(p-3, "...");
+                       break;
+               }
+               sprintf(p, "%02x", cookie->data[i]);
+               p += 2;
+               len -= 2;
+       }
+       *p = '\0';
+
+       return buf;
+}
+#endif