projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[cascardo/linux.git]
/
fs
/
reiserfs
/
xattr.c
diff --git
a/fs/reiserfs/xattr.c
b/fs/reiserfs/xattr.c
index
04b0614
..
4e781e6
100644
(file)
--- a/
fs/reiserfs/xattr.c
+++ b/
fs/reiserfs/xattr.c
@@
-266,7
+266,7
@@
static int reiserfs_for_each_xattr(struct inode *inode,
for (i = 0; !err && i < buf.count && buf.dentries[i]; i++) {
struct dentry *dentry = buf.dentries[i];
for (i = 0; !err && i < buf.count && buf.dentries[i]; i++) {
struct dentry *dentry = buf.dentries[i];
- if (!
S_ISDIR(dentry->d_inode->i_mode
))
+ if (!
d_is_dir(dentry
))
err = action(dentry, data);
dput(dentry);
err = action(dentry, data);
dput(dentry);
@@
-322,7
+322,7
@@
static int delete_one_xattr(struct dentry *dentry, void *data)
struct inode *dir = dentry->d_parent->d_inode;
/* This is the xattr dir, handle specially. */
struct inode *dir = dentry->d_parent->d_inode;
/* This is the xattr dir, handle specially. */
- if (
S_ISDIR(dentry->d_inode->i_mode
))
+ if (
d_is_dir(dentry
))
return xattr_rmdir(dir, dentry);
return xattr_unlink(dir, dentry);
return xattr_rmdir(dir, dentry);
return xattr_unlink(dir, dentry);