Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: (41 commits)
  udf: use crc_itu_t from lib instead of udf_crc
  udf: Fix compilation warnings when UDF debug is on
  udf: Fix bug in VAT mapping code
  udf: Add read-only support for 2.50 UDF media
  udf: Fix handling of multisession media
  udf: Mount filesystem read-only if it has pseudooverwrite partition
  udf: Handle VAT packed inside inode properly
  udf: Allow loading of VAT inode
  udf: Fix detection of VAT version
  udf: Silence warning about accesses beyond end of device
  udf: Improve anchor block detection
  udf: Cleanup anchor block detection.
  udf: Move processing of virtual partitions
  udf: Move filling of partition descriptor info into a separate function
  udf: Improve error recovery on mount
  udf: Cleanup volume descriptor sequence processing
  udf: fix anchor point detection
  udf: Remove declarations of arrays of size UDF_NAME_LEN (256 bytes)
  udf: Remove checking of existence of filename in udf_add_entry()
  udf: Mark udf_process_sequence() as noinline
  ...

1 files changed, 4 insertions, 9 deletions

diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index 84360315aca2..eb9cfa23dc3d 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -21,7 +21,6 @@
 #include "udfdecl.h"
 #include <linux/fs.h>
 #include <linux/quotaops.h>
-#include <linux/udf_fs.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 
@@ -47,11 +46,9 @@ void udf_free_inode(struct inode *inode)
                 struct logicalVolIntegrityDescImpUse *lvidiu =
                                                         udf_sb_lvidiu(sbi);
                 if (S_ISDIR(inode->i_mode))
-                        lvidiu->numDirs =
-                                cpu_to_le32(le32_to_cpu(lvidiu->numDirs) - 1);
+                        le32_add_cpu(&lvidiu->numDirs, -1);
                 else
-                        lvidiu->numFiles =
-                                cpu_to_le32(le32_to_cpu(lvidiu->numFiles) - 1);
+                        le32_add_cpu(&lvidiu->numFiles, -1);
 
                 mark_buffer_dirty(sbi->s_lvid_bh);
         }
@@ -105,11 +102,9 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
                 lvhd = (struct logicalVolHeaderDesc *)
                                 (lvid->logicalVolContentsUse);
                 if (S_ISDIR(mode))
-                        lvidiu->numDirs =
-                                cpu_to_le32(le32_to_cpu(lvidiu->numDirs) + 1);
+                        le32_add_cpu(&lvidiu->numDirs, 1);
                 else
-                        lvidiu->numFiles =
-                                cpu_to_le32(le32_to_cpu(lvidiu->numFiles) + 1);
+                        le32_add_cpu(&lvidiu->numFiles, 1);
                 iinfo->i_unique = uniqueID = le64_to_cpu(lvhd->uniqueID);
                 if (!(++uniqueID & 0x00000000FFFFFFFFUL))
                         uniqueID += 16;