Merge branch 'master' into wrapfs

diff --cc MAINTAINERS
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
Simple merge

diff --cc fs/read_write.c
index e1216aef8df9328dbd188366a08d5cd8359d2b55,e8b0f1192a3a475ab0dcc3a276b9fd184271845e..9f23b46396d4b666eefdee09de08b2a09be4b471
--- 1/fs/read_write.c
--- 2/fs/read_write.c
+++ b/fs/read_write.c
@@@ -558,16 -566,11 +567,12 @@@ ssize_t vfs_write(struct file *file, co
  
        return ret;
  }
 +EXPORT_SYMBOL(vfs_write);
  
- static inline loff_t file_pos_read(struct file *file)
- {
-       return file->f_pos;
- }
- 
- static inline void file_pos_write(struct file *file, loff_t pos)
+ /* file_ppos returns &file->f_pos or NULL if file is stream */
+ static inline loff_t *file_ppos(struct file *file)
  {
-       file->f_pos = pos;
+       return file->f_mode & FMODE_STREAM ? NULL : &file->f_pos;
  }
  
  ssize_t ksys_read(unsigned int fd, char __user *buf, size_t count)

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

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