diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 13:23:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 13:23:44 -0400 |
| commit | 27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0 (patch) | |
| tree | 25a8ca59a3743459bbd48674731becea89a16318 /fs/nfs/dir.c | |
| parent | f80a0ca6ad8f2800453e819dafa09a0ed9e56850 (diff) | |
| parent | 9699eda6bc1f708a28acb716e1477aa351362fe2 (diff) | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
nfs: fix memory leak in nfs_get_sb with CONFIG_NFS_V4
nfs: fix some issues in nfs41_proc_reclaim_complete()
NFS: Ensure that nfs_wb_page() waits for Pg_writeback to clear
NFS: Fix an unstable write data integrity race
nfs: testing for null instead of ERR_PTR()
NFS: rsize and wsize settings ignored on v4 mounts
NFSv4: Don't attempt an atomic open if the file is a mountpoint
SUNRPC: Fix a bug in rpcauth_prune_expired
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index db3ad849a289..a7bb5c694aa3 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -1052,7 +1052,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd) | |||
| 1052 | struct inode *dir; | 1052 | struct inode *dir; |
| 1053 | int openflags, ret = 0; | 1053 | int openflags, ret = 0; |
| 1054 | 1054 | ||
| 1055 | if (!is_atomic_open(nd)) | 1055 | if (!is_atomic_open(nd) || d_mountpoint(dentry)) |
| 1056 | goto no_open; | 1056 | goto no_open; |
| 1057 | parent = dget_parent(dentry); | 1057 | parent = dget_parent(dentry); |
| 1058 | dir = parent->d_inode; | 1058 | dir = parent->d_inode; |