5cbded585d
Run this: #!/bin/sh for f in $(grep -Erl "\([^\)]*\) *k[cmz]alloc" *) ; do echo "De-casting $f..." perl -pi -e "s/ ?= ?\([^\)]*\) *(k[cmz]alloc) *\(/ = \1\(/" $f done And then go through and reinstate those cases where code is casting pointers to non-pointers. And then drop a few hunks which conflicted with outstanding work. Cc: Russell King <rmk@arm.linux.org.uk>, Ian Molton <spyro@f2s.com> Cc: Mikael Starvik <starvik@axis.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Dike <jdike@addtoit.com> Cc: Greg KH <greg@kroah.com> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: Paul Fulghum <paulkf@microgate.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Karsten Keil <kkeil@suse.de> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Jeff Garzik <jeff@garzik.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Ian Kent <raven@themaw.net> Cc: Steven French <sfrench@us.ibm.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Neil Brown <neilb@cse.unsw.edu.au> Cc: Jaroslav Kysela <perex@suse.cz> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
106 lines
2.4 KiB
C
106 lines
2.4 KiB
C
/*
|
|
* linux/fs/lockd/svcshare.c
|
|
*
|
|
* Management of DOS shares.
|
|
*
|
|
* Copyright (C) 1996 Olaf Kirch <okir@monad.swb.de>
|
|
*/
|
|
|
|
#include <linux/time.h>
|
|
#include <linux/unistd.h>
|
|
#include <linux/string.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/sunrpc/clnt.h>
|
|
#include <linux/sunrpc/svc.h>
|
|
#include <linux/lockd/lockd.h>
|
|
#include <linux/lockd/share.h>
|
|
|
|
static inline int
|
|
nlm_cmp_owner(struct nlm_share *share, struct xdr_netobj *oh)
|
|
{
|
|
return share->s_owner.len == oh->len
|
|
&& !memcmp(share->s_owner.data, oh->data, oh->len);
|
|
}
|
|
|
|
__be32
|
|
nlmsvc_share_file(struct nlm_host *host, struct nlm_file *file,
|
|
struct nlm_args *argp)
|
|
{
|
|
struct nlm_share *share;
|
|
struct xdr_netobj *oh = &argp->lock.oh;
|
|
u8 *ohdata;
|
|
|
|
for (share = file->f_shares; share; share = share->s_next) {
|
|
if (share->s_host == host && nlm_cmp_owner(share, oh))
|
|
goto update;
|
|
if ((argp->fsm_access & share->s_mode)
|
|
|| (argp->fsm_mode & share->s_access ))
|
|
return nlm_lck_denied;
|
|
}
|
|
|
|
share = kmalloc(sizeof(*share) + oh->len,
|
|
GFP_KERNEL);
|
|
if (share == NULL)
|
|
return nlm_lck_denied_nolocks;
|
|
|
|
/* Copy owner handle */
|
|
ohdata = (u8 *) (share + 1);
|
|
memcpy(ohdata, oh->data, oh->len);
|
|
|
|
share->s_file = file;
|
|
share->s_host = host;
|
|
share->s_owner.data = ohdata;
|
|
share->s_owner.len = oh->len;
|
|
share->s_next = file->f_shares;
|
|
file->f_shares = share;
|
|
|
|
update:
|
|
share->s_access = argp->fsm_access;
|
|
share->s_mode = argp->fsm_mode;
|
|
return nlm_granted;
|
|
}
|
|
|
|
/*
|
|
* Delete a share.
|
|
*/
|
|
__be32
|
|
nlmsvc_unshare_file(struct nlm_host *host, struct nlm_file *file,
|
|
struct nlm_args *argp)
|
|
{
|
|
struct nlm_share *share, **shpp;
|
|
struct xdr_netobj *oh = &argp->lock.oh;
|
|
|
|
for (shpp = &file->f_shares; (share = *shpp) != 0; shpp = &share->s_next) {
|
|
if (share->s_host == host && nlm_cmp_owner(share, oh)) {
|
|
*shpp = share->s_next;
|
|
kfree(share);
|
|
return nlm_granted;
|
|
}
|
|
}
|
|
|
|
/* X/Open spec says return success even if there was no
|
|
* corresponding share. */
|
|
return nlm_granted;
|
|
}
|
|
|
|
/*
|
|
* Traverse all shares for a given file, and delete
|
|
* those owned by the given (type of) host
|
|
*/
|
|
void nlmsvc_traverse_shares(struct nlm_host *host, struct nlm_file *file,
|
|
nlm_host_match_fn_t match)
|
|
{
|
|
struct nlm_share *share, **shpp;
|
|
|
|
shpp = &file->f_shares;
|
|
while ((share = *shpp) != NULL) {
|
|
if (match(share->s_host, host)) {
|
|
*shpp = share->s_next;
|
|
kfree(share);
|
|
continue;
|
|
}
|
|
shpp = &share->s_next;
|
|
}
|
|
}
|