Commit 07a31f72 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

hfsplus: Call hfsplus_write_begin() and generic_write_end() directly 



There is only one kind of write_begin/write_end aops, so we don't need
to look up which aop it is, just make hfsplus_write_begin() available to
this file and call it directly.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent cfef1f7b

fs/hfsplus/extents.c

+4 −4
Original line number Diff line number Diff line
@@ -557,12 +557,12 @@ void hfsplus_file_truncate(struct inode *inode) 
		void *fsdata;

		loff_t size = inode->i_size;



		res = pagecache_write_begin(NULL, mapping, size, 0, 0,

		res = hfsplus_write_begin(NULL, mapping, size, 0,

					  &page, &fsdata);

		if (res)

			return;

		res = pagecache_write_end(NULL, mapping, size,

			0, 0, page, fsdata);

		res = generic_write_end(NULL, mapping, size, 0, 0,

					page, fsdata);

		if (res < 0)

			return;

		mark_inode_dirty(inode);

fs/hfsplus/hfsplus_fs.h

+2 −0
Original line number Diff line number Diff line
@@ -468,6 +468,8 @@ extern const struct address_space_operations hfsplus_aops; 
extern const struct address_space_operations hfsplus_btree_aops;

extern const struct dentry_operations hfsplus_dentry_operations;



int hfsplus_write_begin(struct file *file, struct address_space *mapping,

		loff_t pos, unsigned len, struct page **pagep, void **fsdata);

struct inode *hfsplus_new_inode(struct super_block *sb, struct inode *dir,

				umode_t mode);

void hfsplus_delete_inode(struct inode *inode);

fs/hfsplus/inode.c

+2 −3
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ static void hfsplus_write_failed(struct address_space *mapping, loff_t to) 
	}

}



static int hfsplus_write_begin(struct file *file, struct address_space *mapping,

			loff_t pos, unsigned len,

			struct page **pagep, void **fsdata)

int hfsplus_write_begin(struct file *file, struct address_space *mapping,

		loff_t pos, unsigned len, struct page **pagep, void **fsdata)

{

	int ret;