diff options
| author | LaMont Jones <lamont@debian.org> | 2010-09-06 14:13:57 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-09-06 14:13:57 -0600 |
| commit | eb3eeb38b6129c7236e9661e12f49bf8e42c085f (patch) | |
| tree | 9db4616b5c80323fd9b660edc1e48972adc7aca9 /lib | |
| parent | 0864d694ca05ea9383ef09bc1bc3a182e15e2ffa (diff) | |
| parent | 73356e0553bd9ac00f556891a4798064c0ee6849 (diff) | |
| download | util-linux-old-eb3eeb38b6129c7236e9661e12f49bf8e42c085f.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
mount/lomount.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/blkdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/blkdev.c b/lib/blkdev.c index 7d00324d..67c4a1ac 100644 --- a/lib/blkdev.c +++ b/lib/blkdev.c @@ -104,7 +104,7 @@ blkdev_get_size(int fd, unsigned long long *bytes) #ifdef DIOCGMEDIASIZE /* FreeBSD */ if (ioctl(fd, DIOCGMEDIASIZE, bytes) >= 0) - return 0 + return 0; #endif #ifdef FDGETPRM |