diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /fs/smbfs | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/dir.c | 4 | ||||
| -rw-r--r-- | fs/smbfs/inode.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c index f2ba59c4f..30138872b 100644 --- a/fs/smbfs/dir.c +++ b/fs/smbfs/dir.c @@ -469,10 +469,6 @@ smb_rmdir(struct inode *dir, struct dentry *dentry) struct inode *inode = dentry->d_inode; int error; - error = -ENOTDIR; - if (!S_ISDIR(inode->i_mode)) - goto out; - /* * Close the directory if it's open. */ diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index e850b7f82..1a278911a 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c @@ -260,7 +260,7 @@ smb_revalidate_inode(struct dentry *dentry) /* * Check whether we've recently refreshed the inode. */ - if (jiffies < inode->u.smbfs_i.oldmtime + HZ/10) + if (time_before(jiffies, inode->u.smbfs_i.oldmtime + HZ/10)) { #ifdef SMBFS_DEBUG_VERBOSE printk("smb_revalidate_inode: up-to-date, jiffies=%lu, oldtime=%lu\n", |