diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /fs/nilfs2/direct.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'fs/nilfs2/direct.c')
| -rw-r--r-- | fs/nilfs2/direct.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c index d369ac718277..236753df5cdf 100644 --- a/fs/nilfs2/direct.c +++ b/fs/nilfs2/direct.c | |||
| @@ -51,11 +51,11 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *bmap, | |||
| 51 | struct nilfs_direct *direct; | 51 | struct nilfs_direct *direct; |
| 52 | __u64 ptr; | 52 | __u64 ptr; |
| 53 | 53 | ||
| 54 | direct = (struct nilfs_direct *)bmap; | 54 | direct = (struct nilfs_direct *)bmap; /* XXX: use macro for level 1 */ |
| 55 | if ((key > NILFS_DIRECT_KEY_MAX) || | 55 | if (key > NILFS_DIRECT_KEY_MAX || level != 1) |
| 56 | (level != 1) || /* XXX: use macro for level 1 */ | 56 | return -ENOENT; |
| 57 | ((ptr = nilfs_direct_get_ptr(direct, key)) == | 57 | ptr = nilfs_direct_get_ptr(direct, key); |
| 58 | NILFS_BMAP_INVALID_PTR)) | 58 | if (ptr == NILFS_BMAP_INVALID_PTR) |
| 59 | return -ENOENT; | 59 | return -ENOENT; |
| 60 | 60 | ||
| 61 | if (ptrp != NULL) | 61 | if (ptrp != NULL) |
| @@ -73,9 +73,10 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *bmap, | |||
| 73 | sector_t blocknr; | 73 | sector_t blocknr; |
| 74 | int ret, cnt; | 74 | int ret, cnt; |
| 75 | 75 | ||
| 76 | if (key > NILFS_DIRECT_KEY_MAX || | 76 | if (key > NILFS_DIRECT_KEY_MAX) |
| 77 | (ptr = nilfs_direct_get_ptr(direct, key)) == | 77 | return -ENOENT; |
| 78 | NILFS_BMAP_INVALID_PTR) | 78 | ptr = nilfs_direct_get_ptr(direct, key); |
| 79 | if (ptr == NILFS_BMAP_INVALID_PTR) | ||
| 79 | return -ENOENT; | 80 | return -ENOENT; |
| 80 | 81 | ||
| 81 | if (NILFS_BMAP_USE_VBN(bmap)) { | 82 | if (NILFS_BMAP_USE_VBN(bmap)) { |