[2/2] shmem: Trigger FS_ERROR notification when file system is full

Commit Message

Gabriel Krisman Bertazi Nov. 16, 2021, 10:07 p.m. UTC

Notify a monitoring application through the new FS_ERROR fsnotify
event that the file system is full, allowing a sysadmin or recovery
application to start recovery procedures.

Signed-off-by: Gabriel Krisman Bertazi <[e-mail]>
---
 mm/shmem.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

Patch

diff --git a/mm/shmem.c b/mm/shmem.c
index 1cdd0253cb7a..525af77d35f3 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -39,6 +39,7 @@ 
 #include <linux/frontswap.h>
 #include <linux/fs_parser.h>
 #include <linux/swapfile.h>
+#include <linux/fsnotify.h>
 
 static struct vfsmount *shm_mnt;
 
@@ -1823,6 +1824,7 @@  static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
 	int error;
 	int once = 0;
 	int alloced = 0;
+	bool max_blocks_reached = false;
 
 	if (index > (MAX_LFS_FILESIZE >> PAGE_SHIFT))
 		return -EFBIG;
@@ -1908,9 +1910,11 @@  static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
 
 		error = PTR_ERR(page);
 		page = NULL;
-		if (error == -EPERM)
+		if (error == -ENOSPC)
+			max_blocks_reached = true;
+		else if (error == -EPERM)
 			error = -ENOSPC;
-		else if (error != -ENOSPC)
+		else
 			goto unlock;
 		/*
 		 * Try to reclaim some space by splitting a huge page
@@ -2024,11 +2028,16 @@  static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
 		unlock_page(page);
 		put_page(page);
 	}
-	if (error == -ENOSPC && !once++) {
-		spin_lock_irq(&info->lock);
-		shmem_recalc_inode(inode);
-		spin_unlock_irq(&info->lock);
-		goto repeat;
+	if (error == -ENOSPC) {
+		if (!once++) {
+			spin_lock_irq(&info->lock);
+			shmem_recalc_inode(inode);
+			spin_unlock_irq(&info->lock);
+			goto repeat;
+		}
+
+		if (max_blocks_reached)
+			fsnotify_sb_error(inode->i_sb, inode, ENOSPC);
 	}
 	if (error == -EEXIST)
 		goto repeat;
@@ -2701,6 +2710,7 @@  static long shmem_fallocate(struct file *file, int mode, loff_t offset,
 	end = (offset + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	/* Try to avoid a swapstorm if len is impossible to satisfy */
 	if (sbinfo->max_blocks && end - start > sbinfo->max_blocks) {
+		fsnotify_sb_error(inode->i_sb, inode, ENOSPC);
 		error = -ENOSPC;
 		goto out;
 	}