Commit fc7e1310 authored by Linus Torvalds's avatar Linus Torvalds
parents 33c37c06 9b5b1f5b
...@@ -157,6 +157,8 @@ void nlmclnt_mark_reclaim(struct nlm_host *host) ...@@ -157,6 +157,8 @@ void nlmclnt_mark_reclaim(struct nlm_host *host)
inode = fl->fl_file->f_dentry->d_inode; inode = fl->fl_file->f_dentry->d_inode;
if (inode->i_sb->s_magic != NFS_SUPER_MAGIC) if (inode->i_sb->s_magic != NFS_SUPER_MAGIC)
continue; continue;
if (fl->fl_u.nfs_fl.owner == NULL)
continue;
if (fl->fl_u.nfs_fl.owner->host != host) if (fl->fl_u.nfs_fl.owner->host != host)
continue; continue;
if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED)) if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED))
...@@ -226,6 +228,8 @@ reclaimer(void *ptr) ...@@ -226,6 +228,8 @@ reclaimer(void *ptr)
inode = fl->fl_file->f_dentry->d_inode; inode = fl->fl_file->f_dentry->d_inode;
if (inode->i_sb->s_magic != NFS_SUPER_MAGIC) if (inode->i_sb->s_magic != NFS_SUPER_MAGIC)
continue; continue;
if (fl->fl_u.nfs_fl.owner == NULL)
continue;
if (fl->fl_u.nfs_fl.owner->host != host) if (fl->fl_u.nfs_fl.owner->host != host)
continue; continue;
if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_RECLAIM)) if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_RECLAIM))
......
...@@ -678,15 +678,9 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t ...@@ -678,15 +678,9 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t
if (!count) if (!count)
goto out; goto out;
if (mapping->nrpages) { retval = nfs_sync_mapping(mapping);
retval = filemap_fdatawrite(mapping);
if (retval == 0)
retval = nfs_wb_all(inode);
if (retval == 0)
retval = filemap_fdatawait(mapping);
if (retval) if (retval)
goto out; goto out;
}
retval = nfs_direct_read(inode, ctx, &iov, pos, 1); retval = nfs_direct_read(inode, ctx, &iov, pos, 1);
if (retval > 0) if (retval > 0)
...@@ -764,15 +758,9 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count, ...@@ -764,15 +758,9 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count,
if (!count) if (!count)
goto out; goto out;
if (mapping->nrpages) { retval = nfs_sync_mapping(mapping);
retval = filemap_fdatawrite(mapping);
if (retval == 0)
retval = nfs_wb_all(inode);
if (retval == 0)
retval = filemap_fdatawait(mapping);
if (retval) if (retval)
goto out; goto out;
}
retval = nfs_direct_write(inode, ctx, &iov, pos, 1); retval = nfs_direct_write(inode, ctx, &iov, pos, 1);
if (mapping->nrpages) if (mapping->nrpages)
......
...@@ -433,11 +433,7 @@ static int do_unlk(struct file *filp, int cmd, struct file_lock *fl) ...@@ -433,11 +433,7 @@ static int do_unlk(struct file *filp, int cmd, struct file_lock *fl)
* Flush all pending writes before doing anything * Flush all pending writes before doing anything
* with locks.. * with locks..
*/ */
filemap_fdatawrite(filp->f_mapping); nfs_sync_mapping(filp->f_mapping);
down(&inode->i_sem);
nfs_wb_all(inode);
up(&inode->i_sem);
filemap_fdatawait(filp->f_mapping);
/* NOTE: special case /* NOTE: special case
* If we're signalled while cleaning up locks on process exit, we * If we're signalled while cleaning up locks on process exit, we
...@@ -465,15 +461,8 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl) ...@@ -465,15 +461,8 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl)
* Flush all pending writes before doing anything * Flush all pending writes before doing anything
* with locks.. * with locks..
*/ */
status = filemap_fdatawrite(filp->f_mapping); status = nfs_sync_mapping(filp->f_mapping);
if (status == 0) { if (status != 0)
down(&inode->i_sem);
status = nfs_wb_all(inode);
up(&inode->i_sem);
if (status == 0)
status = filemap_fdatawait(filp->f_mapping);
}
if (status < 0)
goto out; goto out;
lock_kernel(); lock_kernel();
...@@ -497,11 +486,7 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl) ...@@ -497,11 +486,7 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl)
* Make sure we clear the cache whenever we try to get the lock. * Make sure we clear the cache whenever we try to get the lock.
* This makes locking act as a cache coherency point. * This makes locking act as a cache coherency point.
*/ */
filemap_fdatawrite(filp->f_mapping); nfs_sync_mapping(filp->f_mapping);
down(&inode->i_sem);
nfs_wb_all(inode); /* we may have slept */
up(&inode->i_sem);
filemap_fdatawait(filp->f_mapping);
nfs_zap_caches(inode); nfs_zap_caches(inode);
out: out:
rpc_clnt_sigunmask(NFS_CLIENT(inode), &oldset); rpc_clnt_sigunmask(NFS_CLIENT(inode), &oldset);
......
...@@ -640,6 +640,27 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt) ...@@ -640,6 +640,27 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
return 0; return 0;
} }
/**
* nfs_sync_mapping - helper to flush all mmapped dirty data to disk
*/
int nfs_sync_mapping(struct address_space *mapping)
{
int ret;
if (mapping->nrpages == 0)
return 0;
unmap_mapping_range(mapping, 0, 0, 0);
ret = filemap_fdatawrite(mapping);
if (ret != 0)
goto out;
ret = filemap_fdatawait(mapping);
if (ret != 0)
goto out;
ret = nfs_wb_all(mapping->host);
out:
return ret;
}
/* /*
* Invalidate the local caches * Invalidate the local caches
*/ */
...@@ -1179,11 +1200,8 @@ void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping) ...@@ -1179,11 +1200,8 @@ void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
if (nfsi->cache_validity & NFS_INO_INVALID_DATA) { if (nfsi->cache_validity & NFS_INO_INVALID_DATA) {
if (S_ISREG(inode->i_mode)) { if (S_ISREG(inode->i_mode))
if (filemap_fdatawrite(mapping) == 0) nfs_sync_mapping(mapping);
filemap_fdatawait(mapping);
nfs_wb_all(inode);
}
invalidate_inode_pages2(mapping); invalidate_inode_pages2(mapping);
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
......
...@@ -291,6 +291,7 @@ static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long ...@@ -291,6 +291,7 @@ static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long
/* /*
* linux/fs/nfs/inode.c * linux/fs/nfs/inode.c
*/ */
extern int nfs_sync_mapping(struct address_space *mapping);
extern void nfs_zap_caches(struct inode *); extern void nfs_zap_caches(struct inode *);
extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *, extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *,
struct nfs_fattr *); struct nfs_fattr *);
......
...@@ -638,7 +638,7 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg *msg) ...@@ -638,7 +638,7 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)
gss_msg); gss_msg);
atomic_inc(&gss_msg->count); atomic_inc(&gss_msg->count);
gss_unhash_msg(gss_msg); gss_unhash_msg(gss_msg);
if (msg->errno == -ETIMEDOUT || msg->errno == -EPIPE) { if (msg->errno == -ETIMEDOUT) {
unsigned long now = jiffies; unsigned long now = jiffies;
if (time_after(now, ratelimit)) { if (time_after(now, ratelimit)) {
printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n" printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n"
...@@ -786,7 +786,9 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int taskflags) ...@@ -786,7 +786,9 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int taskflags)
cred->gc_flags = 0; cred->gc_flags = 0;
cred->gc_base.cr_ops = &gss_credops; cred->gc_base.cr_ops = &gss_credops;
cred->gc_service = gss_auth->service; cred->gc_service = gss_auth->service;
do {
err = gss_create_upcall(gss_auth, cred); err = gss_create_upcall(gss_auth, cred);
} while (err == -EAGAIN);
if (err < 0) if (err < 0)
goto out_err; goto out_err;
......
...@@ -174,7 +174,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp) ...@@ -174,7 +174,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp)
goto out; goto out;
msg = (struct rpc_pipe_msg *)filp->private_data; msg = (struct rpc_pipe_msg *)filp->private_data;
if (msg != NULL) { if (msg != NULL) {
msg->errno = -EPIPE; msg->errno = -EAGAIN;
list_del_init(&msg->list); list_del_init(&msg->list);
rpci->ops->destroy_msg(msg); rpci->ops->destroy_msg(msg);
} }
...@@ -183,7 +183,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp) ...@@ -183,7 +183,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp)
if (filp->f_mode & FMODE_READ) if (filp->f_mode & FMODE_READ)
rpci->nreaders --; rpci->nreaders --;
if (!rpci->nreaders) if (!rpci->nreaders)
__rpc_purge_upcall(inode, -EPIPE); __rpc_purge_upcall(inode, -EAGAIN);
if (rpci->ops->release_pipe) if (rpci->ops->release_pipe)
rpci->ops->release_pipe(inode); rpci->ops->release_pipe(inode);
out: out:
......
...@@ -990,6 +990,7 @@ static void xs_udp_connect_worker(void *args) ...@@ -990,6 +990,7 @@ static void xs_udp_connect_worker(void *args)
sk->sk_data_ready = xs_udp_data_ready; sk->sk_data_ready = xs_udp_data_ready;
sk->sk_write_space = xs_udp_write_space; sk->sk_write_space = xs_udp_write_space;
sk->sk_no_check = UDP_CSUM_NORCV; sk->sk_no_check = UDP_CSUM_NORCV;
sk->sk_allocation = GFP_ATOMIC;
xprt_set_connected(xprt); xprt_set_connected(xprt);
...@@ -1074,6 +1075,7 @@ static void xs_tcp_connect_worker(void *args) ...@@ -1074,6 +1075,7 @@ static void xs_tcp_connect_worker(void *args)
sk->sk_data_ready = xs_tcp_data_ready; sk->sk_data_ready = xs_tcp_data_ready;
sk->sk_state_change = xs_tcp_state_change; sk->sk_state_change = xs_tcp_state_change;
sk->sk_write_space = xs_tcp_write_space; sk->sk_write_space = xs_tcp_write_space;
sk->sk_allocation = GFP_ATOMIC;
/* socket options */ /* socket options */
sk->sk_userlocks |= SOCK_BINDPORT_LOCK; sk->sk_userlocks |= SOCK_BINDPORT_LOCK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment