1 files changed, 15 insertions, 17 deletions

diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index 93577561cdbe..46779471c542 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -1,7 +1,7 @@
 /**
  * dir.c - NTFS kernel directory operations. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2001-2004 Anton Altaparmakov
+ * Copyright (c) 2001-2005 Anton Altaparmakov
  * Copyright (c) 2002 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -183,8 +183,7 @@ found_it:
                                 name->len = 0;
                                 *res = name;
                         } else {
-                                if (name)
-                                        kfree(name);
+                                kfree(name);
                                 *res = NULL;
                         }
                         mref = le64_to_cpu(ie->data.dir.indexed_file);
@@ -444,8 +443,7 @@ found_it2:
                                 name->len = 0;
                                 *res = name;
                         } else {
-                                if (name)
-                                        kfree(name);
+                                kfree(name);
                                 *res = NULL;
                         }
                         mref = le64_to_cpu(ie->data.dir.indexed_file);
@@ -610,7 +608,7 @@ dir_err_out:
 // TODO: (AIA)
 // The algorithm embedded in this code will be required for the time when we
 // want to support adding of entries to directories, where we require correct
-// collation of file names in order not to cause corruption of the file system.
+// collation of file names in order not to cause corruption of the filesystem.
 
 /**
  * ntfs_lookup_inode_by_name - find an inode in a directory given its name
@@ -1101,7 +1099,7 @@ static inline int ntfs_filldir(ntfs_volume *vol, loff_t fpos,
 static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
         s64 ia_pos, ia_start, prev_ia_pos, bmp_pos;
-        loff_t fpos;
+        loff_t fpos, i_size;
         struct inode *bmp_vi, *vdir = filp->f_dentry->d_inode;
         struct super_block *sb = vdir->i_sb;
         ntfs_inode *ndir = NTFS_I(vdir);
@@ -1122,7 +1120,8 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                         vdir->i_ino, fpos);
         rc = err = 0;
         /* Are we at end of dir yet? */
-        if (fpos >= vdir->i_size + vol->mft_record_size)
+        i_size = i_size_read(vdir);
+        if (fpos >= i_size + vol->mft_record_size)
                 goto done;
         /* Emulate . and .. for all directories. */
         if (!fpos) {
@@ -1264,7 +1263,7 @@ skip_index_root:
         bmp_mapping = bmp_vi->i_mapping;
         /* Get the starting bitmap bit position and sanity check it. */
         bmp_pos = ia_pos >> ndir->itype.index.block_size_bits;
-        if (unlikely(bmp_pos >> 3 >= bmp_vi->i_size)) {
+        if (unlikely(bmp_pos >> 3 >= i_size_read(bmp_vi))) {
                 ntfs_error(sb, "Current index allocation position exceeds "
                                 "index bitmap size.");
                 goto err_out;
@@ -1301,7 +1300,7 @@ find_next_index_buffer:
                         goto get_next_bmp_page;
                 }
                 /* If we have reached the end of the bitmap, we are done. */
-                if (unlikely(((bmp_pos + cur_bmp_pos) >> 3) >= vdir->i_size))
+                if (unlikely(((bmp_pos + cur_bmp_pos) >> 3) >= i_size))
                         goto unm_EOD;
                 ia_pos = (bmp_pos + cur_bmp_pos) <<
                                 ndir->itype.index.block_size_bits;
@@ -1309,7 +1308,8 @@ find_next_index_buffer:
         ntfs_debug("Handling index buffer 0x%llx.",
                         (unsigned long long)bmp_pos + cur_bmp_pos);
         /* If the current index buffer is in the same page we reuse the page. */
-        if ((prev_ia_pos & PAGE_CACHE_MASK) != (ia_pos & PAGE_CACHE_MASK)) {
+        if ((prev_ia_pos & (s64)PAGE_CACHE_MASK) !=
+                        (ia_pos & (s64)PAGE_CACHE_MASK)) {
                 prev_ia_pos = ia_pos;
                 if (likely(ia_page != NULL)) {
                         unlock_page(ia_page);
@@ -1441,7 +1441,7 @@ unm_EOD:
         ntfs_unmap_page(bmp_page);
 EOD:
         /* We are finished, set fpos to EOD. */
-        fpos = vdir->i_size + vol->mft_record_size;
+        fpos = i_size + vol->mft_record_size;
 abort:
         kfree(name);
 done:
@@ -1461,10 +1461,8 @@ err_out:
                 unlock_page(ia_page);
                 ntfs_unmap_page(ia_page);
         }
-        if (ir)
-                kfree(ir);
-        if (name)
-                kfree(name);
+        kfree(ir);
+        kfree(name);
         if (ctx)
                 ntfs_attr_put_search_ctx(ctx);
         if (m)
@@ -1495,7 +1493,7 @@ err_out:
 static int ntfs_dir_open(struct inode *vi, struct file *filp)
 {
         if (sizeof(unsigned long) < 8) {
-                if (vi->i_size > MAX_LFS_FILESIZE)
+                if (i_size_read(vi) > MAX_LFS_FILESIZE)
                         return -EFBIG;
         }
         return 0;