diff options
Diffstat (limited to 'fs/reiserfs/xattr.c')
-rw-r--r-- | fs/reiserfs/xattr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 1e4d68590178..f01389fd162e 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
@@ -274,7 +274,7 @@ static struct file *open_xa_file(const struct inode *inode, const char *name, | |||
274 | */ | 274 | */ |
275 | static int __xattr_readdir(struct file *filp, void *dirent, filldir_t filldir) | 275 | static int __xattr_readdir(struct file *filp, void *dirent, filldir_t filldir) |
276 | { | 276 | { |
277 | struct inode *inode = filp->f_dentry->d_inode; | 277 | struct inode *inode = filp->f_path.dentry->d_inode; |
278 | struct cpu_key pos_key; /* key of current position in the directory (key of directory entry) */ | 278 | struct cpu_key pos_key; /* key of current position in the directory (key of directory entry) */ |
279 | INITIALIZE_PATH(path_to_entry); | 279 | INITIALIZE_PATH(path_to_entry); |
280 | struct buffer_head *bh; | 280 | struct buffer_head *bh; |
@@ -420,7 +420,7 @@ static int __xattr_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
420 | static | 420 | static |
421 | int xattr_readdir(struct file *file, filldir_t filler, void *buf) | 421 | int xattr_readdir(struct file *file, filldir_t filler, void *buf) |
422 | { | 422 | { |
423 | struct inode *inode = file->f_dentry->d_inode; | 423 | struct inode *inode = file->f_path.dentry->d_inode; |
424 | int res = -ENOTDIR; | 424 | int res = -ENOTDIR; |
425 | if (!file->f_op || !file->f_op->readdir) | 425 | if (!file->f_op || !file->f_op->readdir) |
426 | goto out; | 426 | goto out; |
@@ -508,7 +508,7 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, | |||
508 | goto out; | 508 | goto out; |
509 | } | 509 | } |
510 | 510 | ||
511 | xinode = fp->f_dentry->d_inode; | 511 | xinode = fp->f_path.dentry->d_inode; |
512 | REISERFS_I(inode)->i_flags |= i_has_xattr_dir; | 512 | REISERFS_I(inode)->i_flags |= i_has_xattr_dir; |
513 | 513 | ||
514 | /* we need to copy it off.. */ | 514 | /* we need to copy it off.. */ |
@@ -527,7 +527,7 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, | |||
527 | newattrs.ia_size = buffer_size; | 527 | newattrs.ia_size = buffer_size; |
528 | newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; | 528 | newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; |
529 | mutex_lock(&xinode->i_mutex); | 529 | mutex_lock(&xinode->i_mutex); |
530 | err = notify_change(fp->f_dentry, &newattrs); | 530 | err = notify_change(fp->f_path.dentry, &newattrs); |
531 | if (err) | 531 | if (err) |
532 | goto out_filp; | 532 | goto out_filp; |
533 | 533 | ||
@@ -626,7 +626,7 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer, | |||
626 | goto out; | 626 | goto out; |
627 | } | 627 | } |
628 | 628 | ||
629 | xinode = fp->f_dentry->d_inode; | 629 | xinode = fp->f_path.dentry->d_inode; |
630 | isize = xinode->i_size; | 630 | isize = xinode->i_size; |
631 | REISERFS_I(inode)->i_flags |= i_has_xattr_dir; | 631 | REISERFS_I(inode)->i_flags |= i_has_xattr_dir; |
632 | 632 | ||