diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:51 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:51 +0100 |
commit | 9f6772da061814c2962aeb7d79231f7510dba313 (patch) | |
tree | e0c4a856204af6adff125ee61fe1f3059cada71b /include/linux/nbd.h | |
parent | d998ec4860d366424a55059093bb022beb38a61d (diff) | |
parent | 0f4a56e16d5fc9028b62ba529177a3109513e111 (diff) |
Merge tag 'v3.10.2' into linux-linaro-lsk-androidlsk-android
This is the 3.10.2 stable release
Diffstat (limited to 'include/linux/nbd.h')
-rw-r--r-- | include/linux/nbd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nbd.h b/include/linux/nbd.h index 4871170a04a..ae4981ebd18 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h @@ -41,6 +41,7 @@ struct nbd_device { u64 bytesize; pid_t pid; /* pid of nbd-client, if attached */ int xmit_timeout; + int disconnect; /* a disconnect has been requested by user */ }; #endif |