lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

Browse Source 
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  SUNRPC xptrdma: simplify build configuration
  NFS: Fix a potential file corruption issue when writing
This commit is contained in:
Linus Torvalds
2008-02-07 17:29:02 -08:00
parent 099dc4fb62 3211e4eb58
commit a6a852e937
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/Kconfig
View File

@@ -1778,12 +1778,9 @@ config SUNRPC_GSS
tristate tristate
config SUNRPC_XPRT_RDMA config SUNRPC_XPRT_RDMA
tristate "RDMA transport for sunrpc (EXPERIMENTAL)" tristate
depends on SUNRPC && INFINIBAND && EXPERIMENTAL depends on SUNRPC && INFINIBAND && EXPERIMENTAL
default m default SUNRPC && INFINIBAND
help
Adds a client RPC transport for supporting kernel NFS over RDMA
mounts, including Infiniband and iWARP. Experimental.
config SUNRPC_BIND34 config SUNRPC_BIND34
bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)" bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"

20
fs/nfs/write.c
View File

@@ -696,6 +696,17 @@ int nfs_flush_incompatible(struct file *file, struct page *page)
return status; return status;
} }
/*
* If the page cache is marked as unsafe or invalid, then we can't rely on
* the PageUptodate() flag. In this case, we will need to turn off
* write optimisations that depend on the page contents being correct.
*/
static int nfs_write_pageuptodate(struct page *page, struct inode *inode)
{
return PageUptodate(page) &&
!(NFS_I(inode)->cache_validity & (NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA));
}
/* /*
* Update and possibly write a cached page of an NFS file. * Update and possibly write a cached page of an NFS file.
* *
@@ -717,10 +728,13 @@ int nfs_updatepage(struct file *file, struct page *page,
(long long)(page_offset(page) +offset)); (long long)(page_offset(page) +offset));
/* If we're not using byte range locks, and we know the page /* If we're not using byte range locks, and we know the page
* is entirely in cache, it may be more efficient to avoid * is up to date, it may be more efficient to extend the write
* fragmenting write requests. * to cover the entire page in order to avoid fragmentation
* inefficiencies.
*/ */
if (PageUptodate(page) && inode->i_flock == NULL && !(file->f_mode & O_SYNC)) { if (nfs_write_pageuptodate(page, inode) &&
inode->i_flock == NULL &&
!(file->f_mode & O_SYNC)) {
count = max(count + offset, nfs_page_length(page)); count = max(count + offset, nfs_page_length(page));
offset = 0; offset = 0;
} }