diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /fs/nilfs2/page.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'fs/nilfs2/page.c')
| -rw-r--r-- | fs/nilfs2/page.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 4d2a1ee0eb4..1168059c7ef 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c | |||
| @@ -500,7 +500,7 @@ void nilfs_mapping_init(struct address_space *mapping, | |||
| 500 | mapping_set_gfp_mask(mapping, GFP_NOFS); | 500 | mapping_set_gfp_mask(mapping, GFP_NOFS); |
| 501 | mapping->assoc_mapping = NULL; | 501 | mapping->assoc_mapping = NULL; |
| 502 | mapping->backing_dev_info = bdi; | 502 | mapping->backing_dev_info = bdi; |
| 503 | mapping->a_ops = NULL; | 503 | mapping->a_ops = &empty_aops; |
| 504 | } | 504 | } |
| 505 | 505 | ||
| 506 | /* | 506 | /* |