Merge bk://linux-ntfs.bkbits.net/ntfs-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

diff --cc fs/ntfs/aops.c
Simple merge

diff --cc fs/ntfs/attrib.c
index 46a47923fcc33258363cac563ef4f45f58cfa699,3d08b82f7505d9a0ddbaa31060bb916cd5fe2c70..12583fb5e8351793a20c185830e7ea0c1800f5df
--- 1/fs/ntfs/attrib.c
--- 2/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@@ -973,19 -970,19 +973,19 @@@ int ntfs_map_runlist(ntfs_inode *ni, VC
                goto err_out;
        }
  
 -      down_write(&ni->run_list.lock);
 +      down_write(&ni->runlist.lock);
        /* Make sure someone else didn't do the work while we were sleeping. */
 -      if (likely(vcn_to_lcn(ni->run_list.rl, vcn) <= LCN_RL_NOT_MAPPED)) {
 -              run_list_element *rl;
 +      if (likely(ntfs_vcn_to_lcn(ni->runlist.rl, vcn) <= LCN_RL_NOT_MAPPED)) {
 +              runlist_element *rl;
  
                rl = decompress_mapping_pairs(ni->vol, ctx->attr,
 -                              ni->run_list.rl);
 +                              ni->runlist.rl);
-               if (unlikely(IS_ERR(rl)))
+               if (IS_ERR(rl))
                        err = PTR_ERR(rl);
                else
 -                      ni->run_list.rl = rl;
 +                      ni->runlist.rl = rl;
        }
 -      up_write(&ni->run_list.lock);
 +      up_write(&ni->runlist.lock);
  
        put_attr_search_ctx(ctx);
  err_out:

diff --cc fs/ntfs/dir.c
Simple merge

diff --cc fs/ntfs/inode.c
Simple merge