Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
a54047f1
Commit
a54047f1
authored
21 years ago
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
fs/namei.c
fs/namei.c
+3
-1
fs/nfs/unlink.c
fs/nfs/unlink.c
+2
-3
No files found.
fs/namei.c
View file @
a54047f1
...
...
@@ -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
);
}
...
...
This diff is collapsed.
Click to expand it.
fs/nfs/unlink.c
View file @
a54047f1
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment