GFS2: Small fixes
Hi,
Here are three small one-liner fixes which I'm about to send a pull request for,
Steve.
PATCH 1/3 GFS2: Set GFP_NOFS when allocating page on write
We need to ensure that we always set GFP_NOFS in this one particular case when allocating pages for write.
fs/gfs2/ops_address.c +1 -0
@@ -675,6 +675,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, goto out_trans_fail; error = -ENOMEM ; + flags |=AOP_FLAG_NOFS ; page =grab_cache_page_write_begin (mapping, index, flags); *pagep = page;if (unlikely (!page))
Signature · 1 line
1.6.0.3
PATCH 2/3 GFS2: LSF and LBD are now one and the same
As a result of this recent patch:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=b3a6ffe16b5cc48abe7db8d04882dc45280eb693
We only need to depend on LBD.
fs/gfs2/Kconfig +1 -1
@@ -1,6 +1,6 @@ config GFS2_FS tristate "GFS2 file system support" - depends on EXPERIMENTAL && (64BIT || (LSF && LBD)) + depends on EXPERIMENTAL && (64BIT || LBD) select FS_POSIX_ACL select CRC32 help
Signature · 1 line
1.6.0.3
PATCH 3/3 GFS2: Fix typo in gfs_page_mkwrite()
From: Benjamin Marzinski <[email protected]>
There is a typo in gfs2_page_mkwrite()
gfs2_write_alloc_required() expects pos to be the offset in bytes. However, instead of the page index being shifted by by PAGE_CACHE_SHIFT, it was shifted by (PAGE_CACHE_SIZE - inode->i_blkbits). This patch simply shifts the page index by the proper amount.
fs/gfs2/ops_file.c +1 -1
@@ -342,7 +342,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page)struct gfs2_inode *ip =GFS2_I (inode);struct gfs2_sbd *sdp =GFS2_SB (inode);unsigned long last_index; -u64 pos = page->index << (PAGE_CACHE_SIZE - inode->i_blkbits); +u64 pos = page->index <<PAGE_CACHE_SHIFT ;unsigned int data_blocks, ind_blocks, rblocks;int alloc_required =0 ;struct gfs2_holder gh;
Signature · 1 line
1.6.0.3