Merge quota update from Jan Kara

diff --cc fs/Makefile
index 1d40929ad7bd09a9aa23db262acd6f49d5d65967,44a5fcaf48c9100fb121d359dd110d0077038c20..daf8174867ac79f96849e8420eda0349e312941e
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -7,7 -7,7 +7,7 @@@
  
  O_TARGET := fs.o
  
- export-objs :=        filesystems.o open.o dcache.o buffer.o bio.o inode.o
 -export-objs :=        filesystems.o open.o dcache.o buffer.o bio.o dquot.o
++export-objs :=        filesystems.o open.o dcache.o buffer.o bio.o inode.o dquot.o
  mod-subdirs :=        nls
  
  obj-y :=      open.o read_write.o devices.o file_table.o buffer.o \

diff --cc fs/inode.c
Simple merge

diff --cc fs/super.c
Simple merge

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