Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue: (21 commits)
  leases: fix write-open/read-lease race
  nfs: drop unnecessary locking in llseek
  ext4: replace cut'n'pasted llseek code with generic_file_llseek_size
  vfs: add generic_file_llseek_size
  vfs: do (nearly) lockless generic_file_llseek
  direct-io: merge direct_io_walker into __blockdev_direct_IO
  direct-io: inline the complete submission path
  direct-io: separate map_bh from dio
  direct-io: use a slab cache for struct dio
  direct-io: rearrange fields in dio/dio_submit to avoid holes
  direct-io: fix a wrong comment
  direct-io: separate fields only used in the submission path from struct dio
  vfs: fix spinning prevention in prune_icache_sb
  vfs: add a comment to inode_permission()
  vfs: pass all mask flags check_acl and posix_acl_permission
  vfs: add hex format for MAY_* flag values
  vfs: indicate that the permission functions take all the MAY_* flags
  compat: sync compat_stats with statfs.
  vfs: add "device" tag to /proc/self/mountstats
  cleanup: vfs: small comment fix for block_invalidatepage
  ...

Fix up trivial conflict in fs/gfs2/file.c (llseek changes)

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc fs/compat.c
Simple merge

diff --cc fs/gfs2/file.c
index 5002408dabead6483b5b0424a22c81aa3032ce41,fe6bc0207818ab80c9aa3d8f490e06d45ea006ad..ce36a56dfeac47d9cef9f0fc3a6f1107883b2a26
--- 1/fs/gfs2/file.c
--- 2/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@@ -66,17 -63,11 +66,17 @@@ static loff_t gfs2_llseek(struct file *
                error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY,
                                           &i_gh);
                if (!error) {
-                       error = generic_file_llseek_unlocked(file, offset, origin);
+                       error = generic_file_llseek(file, offset, origin);
                        gfs2_glock_dq_uninit(&i_gh);
                }
 -      } else
 +              break;
 +      case SEEK_CUR:
 +      case SEEK_SET:
-               error = generic_file_llseek_unlocked(file, offset, origin);
+               error = generic_file_llseek(file, offset, origin);
 +              break;
 +      default:
 +              error = -EINVAL;
 +      }
  
        return error;
  }

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