Merge branch 'master' into for-next
Jiri Kosina [Wed, 11 Aug 2010 07:36:51 +0000 (09:36 +0200)]
Conflicts:
fs/exofs/inode.c

13 files changed:
1  2 
block/blk-core.c
drivers/usb/gadget/f_hid.c
drivers/usb/gadget/langwell_udc.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/imx21-hcd.c
drivers/usb/host/ohci-hcd.c
drivers/usb/host/oxu210hp-hcd.c
drivers/usb/misc/ftdi-elan.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/iuu_phoenix.c
fs/exofs/inode.c
fs/exofs/ios.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -709,8 -716,8 +716,8 @@@ int exofs_write_begin(struct file *file
                ret = simple_write_begin(file, mapping, pos, len, flags, pagep,
                                         fsdata);
                if (ret) {
 -                      EXOFS_DBGMSG("simple_write_begin faild\n");
 +                      EXOFS_DBGMSG("simple_write_begin failed\n");
-                       return ret;
+                       goto out;
                }
  
                page = *pagep;
                if (ret) {
                        /*SetPageError was done by _readpage. Is it ok?*/
                        unlock_page(page);
 -                      EXOFS_DBGMSG("__readpage_filler faild\n");
 +                      EXOFS_DBGMSG("__readpage_filler failed\n");
                }
        }
+ out:
+       if (unlikely(ret))
+               _write_failed(mapping->host, pos + len);
  
        return ret;
  }
diff --cc fs/exofs/ios.c
Simple merge