diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index a63031fa3e0c..2f17cb5f00a4 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -2319,8 +2319,8 @@ static int shmem_rmdir(struct inode *dir, struct dentry *dentry) | |||
| 2319 | 2319 | ||
| 2320 | static int shmem_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry) | 2320 | static int shmem_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry) |
| 2321 | { | 2321 | { |
| 2322 | bool old_is_dir = S_ISDIR(old_dentry->d_inode->i_mode); | 2322 | bool old_is_dir = d_is_dir(old_dentry); |
| 2323 | bool new_is_dir = S_ISDIR(new_dentry->d_inode->i_mode); | 2323 | bool new_is_dir = d_is_dir(new_dentry); |
| 2324 | 2324 | ||
| 2325 | if (old_dir != new_dir && old_is_dir != new_is_dir) { | 2325 | if (old_dir != new_dir && old_is_dir != new_is_dir) { |
| 2326 | if (old_is_dir) { | 2326 | if (old_is_dir) { |
