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

Pull quota, ext2, isofs and udf fixes from Jan Kara:

 - two small quota error handling fixes

 - two isofs fixes for architectures with signed char

 - several udf block number overflow and signedness fixes

 - ext2 rework of mount option handling to avoid GFP_KERNEL allocation
   with spinlock held

 - ... it also contains a patch to implement auditing of responses to
   fanotify permission events. That should have been in the fanotify
   pull request but I mistakenly merged that patch into a wrong branch
   and noticed only now at which point I don't think it's worth rebasing
   and redoing.

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: be aware of error from dquot_initialize
  quota: fix potential infinite loop
  isofs: use unsigned char types consistently
  isofs: fix timestamps beyond 2027
  udf: Fix some sign-conversion warnings
  udf: Fix signed/unsigned format specifiers
  udf: Fix 64-bit sign extension issues affecting blocks > 0x7FFFFFFF
  udf: Remove some outdate references from documentation
  udf: Avoid overflow when session starts at large offset
  ext2: Fix possible sleep in atomic during mount option parsing
  ext2: Parse mount options into a dedicated structure
  audit: Record fanotify access control decisions

diff --cc fs/isofs/isofs.h
Simple merge

diff --cc fs/isofs/rock.h
Simple merge

diff --cc fs/isofs/util.c
Simple merge

diff --cc fs/notify/fanotify/fanotify.c
index 54cf2d21b547a5ac28c15eafe472383614369e2b,1968d21a3f37a7e9e122ea4847575a593b92043d..6702a6a0bbb543698509cdc2d367ec3ce68974f1
--- 1/fs/notify/fanotify/fanotify.c
--- 2/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@@ -62,10 -65,21 +63,10 @@@ static int fanotify_get_response(struc
  
        pr_debug("%s: group=%p event=%p\n", __func__, group, event);
  
 -      /*
 -       * fsnotify_prepare_user_wait() fails if we race with mark deletion.
 -       * Just let the operation pass in that case.
 -       */
 -      if (!fsnotify_prepare_user_wait(iter_info)) {
 -              event->response = FAN_ALLOW;
 -              goto out;
 -      }
 -
        wait_event(group->fanotify_data.access_waitq, event->response);
  
 -      fsnotify_finish_user_wait(iter_info);
 -out:
        /* userspace responded, convert to something usable */
-       switch (event->response) {
+       switch (event->response & ~FAN_AUDIT) {
        case FAN_ALLOW:
                ret = 0;
                break;

diff --cc fs/notify/fanotify/fanotify_user.c
Simple merge

diff --cc fs/notify/fdinfo.c
Simple merge

diff --cc fs/quota/dquot.c
Simple merge

diff --cc fs/udf/udfdecl.h
Simple merge

diff --cc include/linux/fsnotify_backend.h
Simple merge

diff --cc include/uapi/linux/audit.h
Simple merge

diff --cc include/uapi/linux/fanotify.h
Simple merge

diff --cc include/uapi/linux/iso_fs.h
Simple merge