diff options
author | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
---|---|---|
committer | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
commit | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch) | |
tree | 047c2d7c8d6cbb0721f017514e1d83a20e278d43 /fs/ext2/dir.c | |
parent | 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff) | |
parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
download | op-kernel-dev-ddae9c2ea79449beb00027cf77fca6dc489f2d15.zip op-kernel-dev-ddae9c2ea79449beb00027cf77fca6dc489f2d15.tar.gz |
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'fs/ext2/dir.c')
-rw-r--r-- | fs/ext2/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 5b5f528..7442bdd 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -592,7 +592,7 @@ int ext2_make_empty(struct inode *inode, struct inode *parent) goto fail; } kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr, 0, chunk_size); + memset(kaddr, 0, chunk_size); de = (struct ext2_dir_entry_2 *)kaddr; de->name_len = 1; de->rec_len = cpu_to_le16(EXT2_DIR_REC_LEN(1)); |