diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 14:53:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 14:53:17 -0700 |
commit | 460352c2f18e18accc993a9127a03e903ed8e0ed (patch) | |
tree | 1f9ea8ac2d965e785fedf79499244788485d6452 /fs/quota | |
parent | 74fee4e88fd196c712abfdae89acfa272abf10f8 (diff) | |
parent | c9ea9df3032eff1c57853fdf3d54e276d63b4b4d (diff) | |
download | linux-stable-460352c2f18e18accc993a9127a03e903ed8e0ed.tar.gz linux-stable-460352c2f18e18accc993a9127a03e903ed8e0ed.tar.bz2 linux-stable-460352c2f18e18accc993a9127a03e903ed8e0ed.zip |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF, reiserfs, quota, fsnotify cleanups from Jan Kara:
"Several UDF, reiserfs, quota and fsnotify cleanups.
Note that there is also a patch updating MAINTAINERS entry for
notification subsystem to point to me as a maintainer since current
entries are stale"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fsnotify: make dnotify_fsnotify_ops const
isofs: Delete an unnecessary variable initialisation in isofs_read_inode()
isofs: Adjust four checks for null pointers
isofs: Delete an error message for a failed memory allocation in isofs_read_inode()
quota_v2: Delete an error message for a failed memory allocation in v2_read_file_info()
fs-udf: Delete an error message for a failed memory allocation in two functions
fs-udf: Improve six size determinations
fs-udf: Adjust two checks for null pointers
reiserfs: fix spelling mistake: "tranasction" -> "transaction"
MAINTAINERS: Update entries for notification subsystem
uapi/linux/quota.h: Do not include linux/errno.h
Diffstat (limited to 'fs/quota')
-rw-r--r-- | fs/quota/quota_v2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c index ca71bf881ad1..2259329616b7 100644 --- a/fs/quota/quota_v2.c +++ b/fs/quota/quota_v2.c @@ -109,11 +109,9 @@ static int v2_read_file_info(struct super_block *sb, int type) return -1; } info->dqi_priv = kmalloc(sizeof(struct qtree_mem_dqinfo), GFP_NOFS); - if (!info->dqi_priv) { - printk(KERN_WARNING - "Not enough memory for quota information structure.\n"); + if (!info->dqi_priv) return -ENOMEM; - } + qinfo = info->dqi_priv; if (version == 0) { /* limits are stored as unsigned 32-bit data */ |