From: Jeff Layton <jlayton@redhat.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 6/9] nfs: eliminate qsilly var from nfs_sillyrename
Date: Fri, 10 Sep 2010 15:27:15 -0400 [thread overview]
Message-ID: <1284146838-1468-7-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1284146838-1468-1-git-send-email-jlayton@redhat.com>
The sdentry should already have the same info in d_name.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/nfs/unlink.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 42cadd1..b9e8b36 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -328,7 +328,6 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
const int countersize = sizeof(sillycounter)*2;
const int slen = sizeof(".nfs")+fileidsize+countersize-1;
char silly[slen+1];
- struct qstr qsilly;
struct dentry *sdentry;
int error = -EIO;
@@ -371,9 +370,8 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
goto out;
} while(sdentry->d_inode != NULL); /* need negative lookup */
- qsilly.name = silly;
- qsilly.len = strlen(silly);
- error = NFS_PROTO(dir)->rename(dir, &dentry->d_name, dir, &qsilly);
+ error = NFS_PROTO(dir)->rename(dir, &dentry->d_name, dir,
+ &sdentry->d_name);
if (dentry->d_inode)
nfs_mark_for_revalidate(dentry->d_inode);
if (!error) {
--
1.7.1
next prev parent reply other threads:[~2010-09-10 19:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 19:27 [PATCH 0/9] nfs: make sure sillyrenames run to completion (try #1) Jeff Layton
2010-09-10 19:27 ` [PATCH 1/9] nfs: eliminate nfs3_renameargs Jeff Layton
2010-09-10 19:27 ` [PATCH 2/9] nfs: convert nfs_renameargs to use qstr structs Jeff Layton
2010-09-10 19:27 ` [PATCH 3/9] nfs: eliminate nfs4_rename_arg Jeff Layton
2010-09-10 19:27 ` [PATCH 4/9] nfs: standardize the rename response container Jeff Layton
2010-09-10 19:27 ` [PATCH 5/9] nfs: move nfs_sillyrename to unlink.c Jeff Layton
2010-09-10 19:27 ` Jeff Layton [this message]
2010-09-10 19:27 ` [PATCH 7/9] nfs: add a rename_setup nfs_rpc_op for async renames Jeff Layton
2010-09-10 19:27 ` [PATCH 8/9] nfs: add rename_done nfs_rpc_op Jeff Layton
2010-09-10 19:27 ` [PATCH 9/9] nfs: make sillyrename an async operation Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284146838-1468-7-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox