Commit 460352c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 74fee4e8 c9ea9df3

MAINTAINERS

+9 −5
Original line number Diff line number Diff line
@@ -4136,7 +4136,9 @@ F: include/linux/dax.h 
F:	include/trace/events/fs_dax.h



DIRECTORY NOTIFICATION (DNOTIFY)

M:	Eric Paris <eparis@parisplace.org>

M:	Jan Kara <jack@suse.cz>

R:	Amir Goldstein <amir73il@gmail.com>

L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	Documentation/filesystems/dnotify.txt

F:	fs/notify/dnotify/
@@ -5247,7 +5249,9 @@ F: Documentation/hwmon/f71805f 
F:	drivers/hwmon/f71805f.c



FANOTIFY

M:	Eric Paris <eparis@redhat.com>

M:	Jan Kara <jack@suse.cz>

R:	Amir Goldstein <amir73il@gmail.com>

L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	fs/notify/fanotify/

F:	include/linux/fanotify.h
@@ -6757,9 +6761,9 @@ S: Maintained 
F:	drivers/mtd/nand/jz4780_*



INOTIFY

M:	John McCutchan <john@johnmccutchan.com>

M:	Robert Love <rlove@rlove.org>

M:	Eric Paris <eparis@parisplace.org>

M:	Jan Kara <jack@suse.cz>

R:	Amir Goldstein <amir73il@gmail.com>

L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	Documentation/filesystems/inotify.txt

F:	fs/notify/inotify/

fs/isofs/inode.c

+5 −6
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int __init init_inodecache(void) 
					0, (SLAB_RECLAIM_ACCOUNT|

					SLAB_MEM_SPREAD|SLAB_ACCOUNT),

					init_once);

	if (isofs_inode_cachep == NULL)

	if (!isofs_inode_cachep)

		return -ENOMEM;

	return 0;

}
@@ -678,7 +678,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) 
			if (isonum_711(vdp->type) == ISO_VD_END)

				break;

			if (isonum_711(vdp->type) == ISO_VD_PRIMARY) {

				if (pri == NULL) {

				if (!pri) {

					pri = (struct iso_primary_descriptor *)vdp;

					/* Save the buffer in case we need it ... */

					pri_bh = bh;
@@ -742,7 +742,7 @@ root_found: 
		goto out_freebh;

	}



	if (joliet_level && (pri == NULL || !opt.rock)) {

	if (joliet_level && (!pri || !opt.rock)) {

		/* This is the case of Joliet with the norock mount flag.

		 * A disc with both Joliet and Rock Ridge is handled later

		 */
@@ -1298,7 +1298,7 @@ static int isofs_read_inode(struct inode *inode, int relocated) 
	unsigned long bufsize = ISOFS_BUFFER_SIZE(inode);

	unsigned long block;

	int high_sierra = sbi->s_high_sierra;

	struct buffer_head *bh = NULL;

	struct buffer_head *bh;

	struct iso_directory_record *de;

	struct iso_directory_record *tmpde = NULL;

	unsigned int de_len;
@@ -1320,8 +1320,7 @@ static int isofs_read_inode(struct inode *inode, int relocated) 
		int frag1 = bufsize - offset;



		tmpde = kmalloc(de_len, GFP_KERNEL);

		if (tmpde == NULL) {

			printk(KERN_INFO "%s: out of memory\n", __func__);

		if (!tmpde) {

			ret = -ENOMEM;

			goto fail;

		}

fs/notify/dnotify/dnotify.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void dnotify_free_mark(struct fsnotify_mark *fsn_mark) 
	kmem_cache_free(dnotify_mark_cache, dn_mark);

}



static struct fsnotify_ops dnotify_fsnotify_ops = {

static const struct fsnotify_ops dnotify_fsnotify_ops = {

	.handle_event = dnotify_handle_event,

	.free_mark = dnotify_free_mark,

};

fs/quota/quota_v2.c

+2 −4
Original line number Diff line number Diff line
@@ -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 */

fs/reiserfs/journal.c

+1 −1
Original line number Diff line number Diff line
@@ -1481,7 +1481,7 @@ static int flush_journal_list(struct super_block *s, 
		if ((!was_jwait) && !buffer_locked(saved_bh)) {

			reiserfs_warning(s, "journal-813",

					 "BAD! buffer %llu %cdirty %cjwait, "

					 "not in a newer tranasction",

					 "not in a newer transaction",

					 (unsigned long long)saved_bh->

					 b_blocknr, was_dirty ? ' ' : '!',

					 was_jwait ? ' ' : '!');

CRA Git | Maintained and supported by SUSTech CRA and CCSE