git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
nfsd
/
nfs4idmap.c
diff --git
a/fs/nfsd/nfs4idmap.c
b/fs/nfsd/nfs4idmap.c
index
4b6aa60
..
b1902eb
100644
(file)
--- a/
fs/nfsd/nfs4idmap.c
+++ b/
fs/nfsd/nfs4idmap.c
@@
-34,7
+34,6
@@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-574,10
+573,9
@@
idmap_lookup(struct svc_rqst *rqstp,
struct idmap_defer_req *mdr;
int ret;
struct idmap_defer_req *mdr;
int ret;
- mdr = k
m
alloc(sizeof(*mdr), GFP_KERNEL);
+ mdr = k
z
alloc(sizeof(*mdr), GFP_KERNEL);
if (!mdr)
return -ENOMEM;
if (!mdr)
return -ENOMEM;
- memset(mdr, 0, sizeof(*mdr));
atomic_set(&mdr->count, 1);
init_waitqueue_head(&mdr->waitq);
mdr->req.defer = idmap_defer;
atomic_set(&mdr->count, 1);
init_waitqueue_head(&mdr->waitq);
mdr->req.defer = idmap_defer;