diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /fs/hppfs | |
| parent | a8d8f02cf0c379693762107afe812b9e52090e39 (diff) | |
| parent | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 (diff) | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'fs/hppfs')
| -rw-r--r-- | fs/hppfs/hppfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c index d4f93b52cec5..e5c06531dcc4 100644 --- a/fs/hppfs/hppfs.c +++ b/fs/hppfs/hppfs.c | |||
| @@ -138,7 +138,7 @@ static int file_removed(struct dentry *dentry, const char *file) | |||
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, | 140 | static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, |
| 141 | struct nameidata *nd) | 141 | unsigned int flags) |
| 142 | { | 142 | { |
| 143 | struct dentry *proc_dentry, *parent; | 143 | struct dentry *proc_dentry, *parent; |
| 144 | struct qstr *name = &dentry->d_name; | 144 | struct qstr *name = &dentry->d_name; |