diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 13:55:33 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 13:55:33 +0000 |
| commit | 7f974a7687129917e3c3ceb74287bdf9ba0fd5f3 (patch) | |
| tree | e5a2ab040ca748a1d3e8f863af05b9f7ef674a76 /fs | |
| parent | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (diff) | |
Merge with Linux 2.3.99-pre5.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 2 | ||||
| -rw-r--r-- | fs/nfs/inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index 58f7a590a..30dd1f7cf 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -522,7 +522,7 @@ static inline int walk_init_root(const char *name, unsigned flags, struct nameidata *nd) { if (current->personality != PER_LINUX) - if (__emul_lookup_dentry(name,flags,nd)); + if (__emul_lookup_dentry(name,flags,nd)) return 0; nd->mnt = mntget(current->fs->rootmnt); nd->dentry = dget(current->fs->root); diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 14c43cd24..56271c14b 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -198,7 +198,7 @@ nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp) static inline unsigned long nfs_calc_block_size(u64 tsize) { - loff_t used = (tsize + 511) / 512; + loff_t used = (tsize + 511) >> 9; return (used > ULONG_MAX) ? ULONG_MAX : used; } |