diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 10:40:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 10:40:53 -0400 |
| commit | bfab08c097df5f6a60dd07f0f8c78c54e725780b (patch) | |
| tree | a93536a2bbcb2331e47d72dd182bb4c4d27b6d8b /fs/jfs/jfs_dmap.c | |
| parent | eb0e0076878a4f9e8e6e7e524ded0d6f7d4a6130 (diff) | |
| parent | 438282d85de2c8f8c5183fdf55140e51a0b18670 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Diffstat (limited to 'fs/jfs/jfs_dmap.c')
| -rw-r--r-- | fs/jfs/jfs_dmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index c739626f5bf1..eadf319bee22 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c | |||
| @@ -3055,7 +3055,7 @@ static int cntlz(u32 value) | |||
| 3055 | * RETURN VALUES: | 3055 | * RETURN VALUES: |
| 3056 | * log2 number of blocks | 3056 | * log2 number of blocks |
| 3057 | */ | 3057 | */ |
| 3058 | int blkstol2(s64 nb) | 3058 | static int blkstol2(s64 nb) |
| 3059 | { | 3059 | { |
| 3060 | int l2nb; | 3060 | int l2nb; |
| 3061 | s64 mask; /* meant to be signed */ | 3061 | s64 mask; /* meant to be signed */ |