Commit a54047f1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge kroah.com:/home/greg/linux/BK/bleed-2.5

into kroah.com:/home/greg/linux/BK/pci-2.5
parents 0003fb89 32538906
No related merge requests found
......@@ -1631,7 +1631,9 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
error = dir->i_op->unlink(dir, dentry);
}
up(&dentry->d_inode->i_sem);
if (!error) {
/* We don't d_delete() NFS sillyrenamed files--they still exist. */
if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) {
d_delete(dentry);
inode_dir_notify(dir, DN_DELETE);
}
......
......@@ -150,8 +150,7 @@ nfs_async_unlink_release(struct rpc_task *task)
/**
* nfs_async_unlink - asynchronous unlinking of a file
* @dir: directory in which the file resides.
* @name: name of the file to unlink.
* @dentry: dentry to unlink
*/
int
nfs_async_unlink(struct dentry *dentry)
......@@ -190,7 +189,7 @@ nfs_async_unlink(struct dentry *dentry)
}
/**
* nfs_complete_remove - Initialize completion of the sillydelete
* nfs_complete_unlink - Initialize completion of the sillydelete
* @dentry: dentry to delete
*
* Since we're most likely to be called by dentry_iput(), we
......
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