The patch titled afs-convert-to-new-aops update has been added to the -mm tree. Its filename is afs-convert-to-new-aops-update.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: afs-convert-to-new-aops update From: David Howells <dhowells@xxxxxxxxxx> David sent a secretly different version. Cc: Nick Piggin <npiggin@xxxxxxx> Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/afs/write.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN fs/afs/write.c~afs-convert-to-new-aops-update fs/afs/write.c --- a/fs/afs/write.c~afs-convert-to-new-aops-update +++ a/fs/afs/write.c @@ -84,7 +84,7 @@ void afs_put_writeback(struct afs_writeb * partly or wholly fill a page that's under preparation for writing */ static int afs_fill_page(struct afs_vnode *vnode, struct key *key, - loff_t pos, unsigned len, struct page *page) + loff_t pos, unsigned len, struct page *page) { loff_t i_size; unsigned eof; @@ -118,16 +118,16 @@ static int afs_fill_page(struct afs_vnod * prepare to perform part of a write to a page */ int afs_write_begin(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata) + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata) { - struct page *page; struct afs_writeback *candidate, *wb; struct afs_vnode *vnode = AFS_FS_I(file->f_dentry->d_inode); + struct page *page; struct key *key = file->private_data; - pgoff_t index = pos >> PAGE_CACHE_SHIFT; unsigned from = pos & (PAGE_CACHE_SIZE - 1); unsigned to = from + len; + pgoff_t index = pos >> PAGE_CACHE_SHIFT; int ret; _enter("{%x:%u},{%lx},%u,%u", @@ -244,8 +244,8 @@ flush_conflicting_wb: * finalise part of a write to a page */ int afs_write_end(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned copied, - struct page *page, void *fsdata) + loff_t pos, unsigned len, unsigned copied, + struct page *page, void *fsdata) { struct afs_vnode *vnode = AFS_FS_I(file->f_dentry->d_inode); loff_t i_size, maybe_i_size; _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are origin.patch mm-tiny-shmem-nommu-fix.patch git-v4l-dvb.patch git-xfs.patch git-mtd.patch git-cifs.patch git-drm.patch git-security-testing.patch uclinux-fix-gzip-header-parsing-in-binfmt_flatc.patch autofs4-add-miscellaneous-device-for-ioctls-fix-fix-3.patch binfmt_elf_fdpic-support-auxvec-base-platform-string.patch binfmt_elf_fdpic-convert-initial-stack-alignment-to-arch_align_stack.patch binfmt_elf_fdpic-wire-up-at_execfd-at_execfn-at_secure.patch sysctl-simplify-strategy.patch afs-convert-to-new-aops.patch afs-convert-to-new-aops-update.patch mn10300-use-bcd2bin-bin2bcd.patch mutex-subsystem-synchro-test-module.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html