Pull battery into release branch

[linux-2.6] / fs / ntfs / inode.c

diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index f8bf8da67ee8f86bb0813b231f55ddbfc5148a46..b532a730cec2378072a20304fb85d07ed0d529f3 100644 (file)
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -27,7 +27,6 @@
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 
 #include "aops.h"
 #include "attrib.h"
@@ -141,7 +140,7 @@ static int ntfs_init_locked_inode(struct inode *vi, ntfs_attr *na)
                if (!ni->name)
                        return -ENOMEM;
                memcpy(ni->name, na->name, i);
-               ni->name[i] = 0;
+               ni->name[na->name_len] = 0;
        }
        return 0;
 }