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

Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

Browse Source 
* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Fix dentry revalidation for NFSv4 referrals and mountpoint crossings
  NFS: Fix the fsid revalidation in nfs_update_inode()
  SUNRPC: Fix a nfs4 over rdma transport oops
  NFS: Fix an f_mode/f_flags confusion in fs/nfs/write.c
This commit is contained in:
Linus Torvalds
2008-03-07 12:08:07 -08:00
parent 5d49c101a1 4e99a1ff34
commit 4c1aa6f8b9
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/dir.c
View File

@@ -710,6 +710,8 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd)
{ {
struct nfs_server *server = NFS_SERVER(inode); struct nfs_server *server = NFS_SERVER(inode);
if (test_bit(NFS_INO_MOUNTPOINT, &NFS_I(inode)->flags))
return 0;
if (nd != NULL) { if (nd != NULL) {
/* VFS wants an on-the-wire revalidation */ /* VFS wants an on-the-wire revalidation */
if (nd->flags & LOOKUP_REVAL) if (nd->flags & LOOKUP_REVAL)

6
fs/nfs/inode.c
View File

@@ -299,6 +299,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
else else
inode->i_op = &nfs_mountpoint_inode_operations; inode->i_op = &nfs_mountpoint_inode_operations;
inode->i_fop = NULL; inode->i_fop = NULL;
set_bit(NFS_INO_MOUNTPOINT, &nfsi->flags);
} }
} else if (S_ISLNK(inode->i_mode)) } else if (S_ISLNK(inode->i_mode))
inode->i_op = &nfs_symlink_inode_operations; inode->i_op = &nfs_symlink_inode_operations;
@@ -1003,8 +1004,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
server = NFS_SERVER(inode); server = NFS_SERVER(inode);
/* Update the fsid? */ /* Update the fsid? */
if (S_ISDIR(inode->i_mode) if (S_ISDIR(inode->i_mode) &&
&& !nfs_fsid_equal(&server->fsid, &fattr->fsid)) !nfs_fsid_equal(&server->fsid, &fattr->fsid) &&
!test_bit(NFS_INO_MOUNTPOINT, &nfsi->flags))
server->fsid = fattr->fsid; server->fsid = fattr->fsid;
/* /*

2
fs/nfs/write.c
View File

@@ -734,7 +734,7 @@ int nfs_updatepage(struct file *file, struct page *page,
*/ */
if (nfs_write_pageuptodate(page, inode) && if (nfs_write_pageuptodate(page, inode) &&
inode->i_flock == NULL && inode->i_flock == NULL &&
!(file->f_mode & O_SYNC)) { !(file->f_flags & O_SYNC)) {
count = max(count + offset, nfs_page_length(page)); count = max(count + offset, nfs_page_length(page));
offset = 0; offset = 0;
} }

1
include/linux/nfs_fs.h
View File

@@ -195,6 +195,7 @@ struct nfs_inode {
#define NFS_INO_ADVISE_RDPLUS (1) /* advise readdirplus */ #define NFS_INO_ADVISE_RDPLUS (1) /* advise readdirplus */
#define NFS_INO_STALE (2) /* possible stale inode */ #define NFS_INO_STALE (2) /* possible stale inode */
#define NFS_INO_ACL_LRU_SET (3) /* Inode is on the LRU list */ #define NFS_INO_ACL_LRU_SET (3) /* Inode is on the LRU list */
#define NFS_INO_MOUNTPOINT (4) /* inode is remote mountpoint */
static inline struct nfs_inode *NFS_I(const struct inode *inode) static inline struct nfs_inode *NFS_I(const struct inode *inode)
{ {

6
net/sunrpc/xprtrdma/transport.c
View File

@@ -614,7 +614,11 @@ xprt_rdma_free(void *buffer)
return; return;
req = container_of(buffer, struct rpcrdma_req, rl_xdr_buf[0]); req = container_of(buffer, struct rpcrdma_req, rl_xdr_buf[0]);
r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf); if (req->rl_iov.length == 0) { /* see allocate above */
r_xprt = container_of(((struct rpcrdma_req *) req->rl_buffer)->rl_buffer,
struct rpcrdma_xprt, rx_buf);
} else
r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
rep = req->rl_reply; rep = req->rl_reply;
dprintk("RPC: %s: called on 0x%p%s\n", dprintk("RPC: %s: called on 0x%p%s\n",