From 8e04b481d4aad6552e484c2adbd067dcd356a9fd Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Tue, 22 May 2012 10:10:03 -0400 Subject: [PATCH] --- yaml --- r: 308640 b: refs/heads/master c: 497826af60f812240ed5b6ba80541f7c9f2154d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4filelayout.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7254f9945f73..e65aec8ada93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd4aeffb5b89070ae93c579f1d5a0758f7123e8b +refs/heads/master: 497826af60f812240ed5b6ba80541f7c9f2154d9 diff --git a/trunk/fs/nfs/nfs4filelayout.c b/trunk/fs/nfs/nfs4filelayout.c index 56aa0ec1b169..ddea4d3f598e 100644 --- a/trunk/fs/nfs/nfs4filelayout.c +++ b/trunk/fs/nfs/nfs4filelayout.c @@ -85,15 +85,14 @@ filelayout_get_dserver_offset(struct pnfs_layout_segment *lseg, loff_t offset) static void filelayout_reset_write(struct nfs_write_data *data) { struct nfs_pgio_header *hdr = data->header; - struct inode *inode = hdr->inode; struct rpc_task *task = &data->task; if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) { dprintk("%s Reset task %5u for i/o through MDS " "(req %s/%lld, %u bytes @ offset %llu)\n", __func__, data->task.tk_pid, - inode->i_sb->s_id, - (long long)NFS_FILEID(inode), + hdr->inode->i_sb->s_id, + (long long)NFS_FILEID(hdr->inode), data->args.count, (unsigned long long)data->args.offset); @@ -106,15 +105,14 @@ static void filelayout_reset_write(struct nfs_write_data *data) static void filelayout_reset_read(struct nfs_read_data *data) { struct nfs_pgio_header *hdr = data->header; - struct inode *inode = hdr->inode; struct rpc_task *task = &data->task; if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) { dprintk("%s Reset task %5u for i/o through MDS " "(req %s/%lld, %u bytes @ offset %llu)\n", __func__, data->task.tk_pid, - inode->i_sb->s_id, - (long long)NFS_FILEID(inode), + hdr->inode->i_sb->s_id, + (long long)NFS_FILEID(hdr->inode), data->args.count, (unsigned long long)data->args.offset);