Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[linux-2.6-omap-h63xx.git] / fs / lockd / svcshare.c

diff --git a/fs/lockd/svcshare.c b/fs/lockd/svcshare.c
index b9926ce8782e86b7782ab752e61474af35806cca..068886de4dda19b176ab2340da64269c05d87da1 100644 (file)
--- a/fs/lockd/svcshare.c
+++ b/fs/lockd/svcshare.c
@@ -23,7 +23,7 @@ nlm_cmp_owner(struct nlm_share *share, struct xdr_netobj *oh)
            && !memcmp(share->s_owner.data, oh->data, oh->len);
 }
 
-u32
+__be32
 nlmsvc_share_file(struct nlm_host *host, struct nlm_file *file,
                        struct nlm_args *argp)
 {
@@ -39,7 +39,7 @@ nlmsvc_share_file(struct nlm_host *host, struct nlm_file *file,
                        return nlm_lck_denied;
        }
 
-       share = (struct nlm_share *) kmalloc(sizeof(*share) + oh->len,
+       share = kmalloc(sizeof(*share) + oh->len,
                                                GFP_KERNEL);
        if (share == NULL)
                return nlm_lck_denied_nolocks;
@@ -64,7 +64,7 @@ update:
 /*
  * Delete a share.
  */
-u32
+__be32
 nlmsvc_unshare_file(struct nlm_host *host, struct nlm_file *file,
                        struct nlm_args *argp)
 {