Merge branch 'akpm' (Andrew's patch-bomb)

Merge Andrew's first set of patches:
 "Non-MM patches:

   - lots of misc bits

   - tree-wide have_clk() cleanups

   - quite a lot of printk tweaks.  I draw your attention to "printk:
     convert the format for KERN_<LEVEL> to a 2 byte pattern" which
     looks a bit scary.  But afaict it's solid.

   - backlight updates

   - lib/ feature work (notably the addition and use of memweight())

   - checkpatch updates

   - rtc updates

   - nilfs updates

   - fatfs updates (partial, still waiting for acks)

   - kdump, proc, fork, IPC, sysctl, taskstats, pps, etc

   - new fault-injection feature work"

* Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (128 commits)
  drivers/misc/lkdtm.c: fix missing allocation failure check
  lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()
  fault-injection: add tool to run command with failslab or fail_page_alloc
  fault-injection: add selftests for cpu and memory hotplug
  powerpc: pSeries reconfig notifier error injection module
  memory: memory notifier error injection module
  PM: PM notifier error injection module
  cpu: rewrite cpu-notifier-error-inject module
  fault-injection: notifier error injection
  c/r: fcntl: add F_GETOWNER_UIDS option
  resource: make sure requested range is included in the root range
  include/linux/aio.h: cpp->C conversions
  fs: cachefiles: add support for large files in filesystem caching
  pps: return PTR_ERR on error in device_create
  taskstats: check nla_reserve() return
  sysctl: suppress kmemleak messages
  ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
  ipc: compat: use signed size_t types for msgsnd and msgrcv
  ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC
  ipc: add COMPAT_SHMLBA support
  ...

1 files changed, 3 insertions, 8 deletions

diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index 6cc480652433..6a6d8c0715a1 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -651,8 +651,7 @@ shortname:
         de->time = de->ctime = time;
         de->date = de->cdate = de->adate = date;
         de->ctime_cs = time_cs;
-        de->start = cpu_to_le16(cluster);
-        de->starthi = cpu_to_le16(cluster >> 16);
+        fat_set_start(de, cluster);
         de->size = 0;
 out_free:
         __putname(uname);
@@ -965,9 +964,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
                 mark_inode_dirty(old_inode);
 
         if (update_dotdot) {
-                int start = MSDOS_I(new_dir)->i_logstart;
-                dotdot_de->start = cpu_to_le16(start);
-                dotdot_de->starthi = cpu_to_le16(start >> 16);
+                fat_set_start(dotdot_de, MSDOS_I(new_dir)->i_logstart);
                 mark_buffer_dirty_inode(dotdot_bh, old_inode);
                 if (IS_DIRSYNC(new_dir)) {
                         err = sync_dirty_buffer(dotdot_bh);
@@ -1009,9 +1006,7 @@ error_dotdot:
         corrupt = 1;
 
         if (update_dotdot) {
-                int start = MSDOS_I(old_dir)->i_logstart;
-                dotdot_de->start = cpu_to_le16(start);
-                dotdot_de->starthi = cpu_to_le16(start >> 16);
+                fat_set_start(dotdot_de, MSDOS_I(old_dir)->i_logstart);
                 mark_buffer_dirty_inode(dotdot_bh, old_inode);
                 corrupt |= sync_dirty_buffer(dotdot_bh);
         }