Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable

[karo-tx-linux.git] / fs / nfs / unlink.c

diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 7bdec8531400a8955d2292221debb83004bcd29f..e313a51acdd18cd090427365fcf7dd209847be81 100644 (file)
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -429,7 +429,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
        data = kzalloc(sizeof(*data), GFP_KERNEL);
        if (data == NULL)
                return ERR_PTR(-ENOMEM);
-       task_setup_data.callback_data = data,
+       task_setup_data.callback_data = data;
 
        data->cred = rpc_lookup_cred();
        if (IS_ERR(data->cred)) {
@@ -496,7 +496,7 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
 
        dfprintk(VFS, "NFS: silly-rename(%s/%s, ct=%d)\n",
                dentry->d_parent->d_name.name, dentry->d_name.name,
-               atomic_read(&dentry->d_count));
+               dentry->d_count);
        nfs_inc_stats(dir, NFSIOS_SILLYRENAME);
 
        /*