diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /fs/ncpfs/file.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ncpfs/file.c')
| -rw-r--r-- | fs/ncpfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index df37524b85db..b91fea03b1c3 100644 --- a/fs/ncpfs/file.c +++ b/fs/ncpfs/file.c | |||
| @@ -101,7 +101,7 @@ out: | |||
| 101 | static ssize_t | 101 | static ssize_t |
| 102 | ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | 102 | ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) |
| 103 | { | 103 | { |
| 104 | struct dentry *dentry = file->f_dentry; | 104 | struct dentry *dentry = file->f_path.dentry; |
| 105 | struct inode *inode = dentry->d_inode; | 105 | struct inode *inode = dentry->d_inode; |
| 106 | size_t already_read = 0; | 106 | size_t already_read = 0; |
| 107 | off_t pos; | 107 | off_t pos; |
| @@ -182,7 +182,7 @@ outrel: | |||
| 182 | static ssize_t | 182 | static ssize_t |
| 183 | ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) | 183 | ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) |
| 184 | { | 184 | { |
| 185 | struct dentry *dentry = file->f_dentry; | 185 | struct dentry *dentry = file->f_path.dentry; |
| 186 | struct inode *inode = dentry->d_inode; | 186 | struct inode *inode = dentry->d_inode; |
| 187 | size_t already_written = 0; | 187 | size_t already_written = 0; |
| 188 | off_t pos; | 188 | off_t pos; |