diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
| commit | b604585914e032b28bef3e337a978e56a9069cda (patch) | |
| tree | b2ee0a3fb38d10397c602d0fe215ea3bbbf334c0 /libbb/loop.c | |
| parent | 0eda07c7ff8cf1fc11bc1bda5383f884d7adf031 (diff) | |
| parent | ba76b7a40b929878833731f76306b1c977cc8650 (diff) | |
| download | busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.gz busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.bz2 busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/loop.c')
| -rw-r--r-- | libbb/loop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbb/loop.c b/libbb/loop.c index b3a520848..823fba079 100644 --- a/libbb/loop.c +++ b/libbb/loop.c | |||
| @@ -150,9 +150,9 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse | |||
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | /* If this block device already set up right, re-use it. | 152 | /* If this block device already set up right, re-use it. |
| 153 | (Yes this is racy, but associating two loop devices with the same | 153 | * (Yes this is racy, but associating two loop devices with the same |
| 154 | file isn't pretty either. In general, mounting the same file twice | 154 | * file isn't pretty either. In general, mounting the same file twice |
| 155 | without using losetup manually is problematic.) | 155 | * without using losetup manually is problematic.) |
| 156 | */ | 156 | */ |
| 157 | } else | 157 | } else |
| 158 | if (strcmp(file, (char *)loopinfo.lo_file_name) != 0 | 158 | if (strcmp(file, (char *)loopinfo.lo_file_name) != 0 |