The patch titled
NFS,SUNRPC: Fix compiler warnings if CONFIG_PROC_FS & CONFIG_SYSCTL are unset
has been removed from the -mm tree. Its filename is
nfssunrpc-fix-compiler-warnings-if-config_proc_fs-config_sysctl-are-unset.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/direct.c | 8 +++-----
fs/nfs/file.c | 5 ++---
include/linux/sunrpc/xprt.h | 1 +
3 files changed, 6 insertions(+), 8 deletions(-)
diff -puN fs/nfs/direct.c~nfssunrpc-fix-compiler-warnings-if-config_proc_fs-config_sysctl-are-unset fs/nfs/direct.c
--- 25/fs/nfs/direct.c~nfssunrpc-fix-compiler-warnings-if-config_proc_fs-config_sysctl-are-unset Tue Apr 11 15:08:39 2006
+++ 25-akpm/fs/nfs/direct.c Tue Apr 11 15:08:39 2006
@@ -112,10 +112,9 @@ static void nfs_direct_write_complete(st
*/
ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs)
{
- struct dentry *dentry = iocb->ki_filp->f_dentry;
-
dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n",
- dentry->d_name.name, (long long) pos, nr_segs);
+ iocb->ki_filp->f_dentry->d_name.name,
+ (long long) pos, nr_segs);
return -EINVAL;
}
@@ -468,7 +467,6 @@ static const struct rpc_call_ops nfs_com
static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
{
struct nfs_write_data *data = dreq->commit_data;
- struct rpc_task *task = &data->task;
data->inode = dreq->inode;
data->cred = dreq->ctx->cred;
@@ -489,7 +487,7 @@ static void nfs_direct_commit_schedule(s
/* Note: task.tk_ops->rpc_release will free dreq->commit_data */
dreq->commit_data = NULL;
- dprintk("NFS: %5u initiated commit call\n", task->tk_pid);
+ dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid);
lock_kernel();
rpc_execute(&data->task);
diff -puN fs/nfs/file.c~nfssunrpc-fix-compiler-warnings-if-config_proc_fs-config_sysctl-are-unset fs/nfs/file.c
--- 25/fs/nfs/file.c~nfssunrpc-fix-compiler-warnings-if-config_proc_fs-config_sysctl-are-unset Tue Apr 11 15:08:39 2006
+++ 25-akpm/fs/nfs/file.c Tue Apr 11 15:08:39 2006
@@ -534,10 +534,9 @@ static int nfs_lock(struct file *filp, i
*/
static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
{
- struct inode * inode = filp->f_mapping->host;
-
dprintk("NFS: nfs_flock(f=%s/%ld, t=%x, fl=%x)\n",
- inode->i_sb->s_id, inode->i_ino,
+ filp->f_dentry->d_inode->i_sb->s_id,
+ filp->f_dentry->d_inode->i_ino,
fl->fl_type, fl->fl_flags);
/*
diff -puN include/linux/sunrpc/xprt.h~nfssunrpc-fix-compiler-warnings-if-config_proc_fs-config_sysctl-are-unset include/linux/sunrpc/xprt.h
--- 25/include/linux/sunrpc/xprt.h~nfssunrpc-fix-compiler-warnings-if-config_proc_fs-config_sysctl-are-unset Tue Apr 11 15:08:39 2006
+++ 25-akpm/include/linux/sunrpc/xprt.h Tue Apr 11 15:08:39 2006
@@ -53,6 +53,7 @@ struct rpc_timeout {
struct rpc_task;
struct rpc_xprt;
+struct seq_file;
/*
* This describes a complete RPC request
_
Patches currently in -mm which might be from trond.myklebust@xxxxxxxxxx are
origin.patch
remove-steal_locks.patch
locks-dont-unnecessarily-fail-posix-lock-operations.patch
locks-dont-do-unnecessary-allocations.patch
locks-clean-up-locks_remove_posix.patch
vfs-add-lock-owner-argument-to-flush-operation.patch
fs-locksc-make-posix_locks_deadlock-static.patch
proc-dont-lock-task_structs-indefinitely.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
