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 branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
quota.c
diff --git
a/fs/quota.c
b/fs/quota.c
index 99b24b52bfc83cbd8f851044dbe2ae27f8e1fc4b..84f28dd721163eb5ef09166bb3d96569c9724b6a 100644
(file)
--- a/
fs/quota.c
+++ b/
fs/quota.c
@@
-341,11
+341,11
@@
static inline struct super_block *quotactl_block(const char __user *special)
char *tmp = getname(special);
if (IS_ERR(tmp))
char *tmp = getname(special);
if (IS_ERR(tmp))
- return ERR_
PTR(PTR_ERR(tmp)
);
+ return ERR_
CAST(tmp
);
bdev = lookup_bdev(tmp);
putname(tmp);
if (IS_ERR(bdev))
bdev = lookup_bdev(tmp);
putname(tmp);
if (IS_ERR(bdev))
- return ERR_
PTR(PTR_ERR(bdev)
);
+ return ERR_
CAST(bdev
);
sb = get_super(bdev);
bdput(bdev);
if (!sb)
sb = get_super(bdev);
bdput(bdev);
if (!sb)