diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 11:47:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 11:47:51 -0700 |
| commit | af6ea9ca23504fe620412826a420dca9c43a8bf6 (patch) | |
| tree | 19bebbeb442a8d08ad29f2056665b5fdd9bf1478 /fs/ntfs/index.c | |
| parent | 1fa4aad496b9c96fcde6c8f905a43ae6733e5a79 (diff) | |
| parent | c514720716c7b109ff980f8b3cb93f9af872c91c (diff) | |
| download | kernel-crypto-af6ea9ca23504fe620412826a420dca9c43a8bf6.tar.gz kernel-crypto-af6ea9ca23504fe620412826a420dca9c43a8bf6.tar.xz kernel-crypto-af6ea9ca23504fe620412826a420dca9c43a8bf6.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Diffstat (limited to 'fs/ntfs/index.c')
| -rw-r--r-- | fs/ntfs/index.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c index 71bd2cd7a4d..11fd5307d78 100644 --- a/fs/ntfs/index.c +++ b/fs/ntfs/index.c @@ -1,7 +1,7 @@ /* * index.c - NTFS kernel index handling. Part of the Linux-NTFS project. * - * Copyright (c) 2004 Anton Altaparmakov + * Copyright (c) 2004-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -39,18 +39,8 @@ ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni) ntfs_index_context *ictx; ictx = kmem_cache_alloc(ntfs_index_ctx_cache, SLAB_NOFS); - if (ictx) { - ictx->idx_ni = idx_ni; - ictx->entry = NULL; - ictx->data = NULL; - ictx->data_len = 0; - ictx->is_in_root = 0; - ictx->ir = NULL; - ictx->actx = NULL; - ictx->base_ni = NULL; - ictx->ia = NULL; - ictx->page = NULL; - } + if (ictx) + *ictx = (ntfs_index_context){ .idx_ni = idx_ni }; return ictx; } |