projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
loop.h
diff --git
a/include/linux/loop.h
b/include/linux/loop.h
index 11a41a8f08eb9e98cb1105982d093c3d075d5206..9635116dd830e3634a6c6e2d06219eb36661578c 100644
(file)
--- a/
include/linux/loop.h
+++ b/
include/linux/loop.h
@@
-44,7
+44,7
@@
struct loop_device {
int lo_encrypt_key_size;
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
int lo_encrypt_key_size;
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
-
uid_t
lo_key_owner; /* Who set the key */
+
kuid_t
lo_key_owner; /* Who set the key */
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);