From 80edf80aaad3bf76ae6b64330974296ca7d3d1bb Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 8 Feb 2008 04:20:27 -0800 Subject: [PATCH] --- yaml --- r: 84727 b: refs/heads/master c: 9261303ab7589cda6a3b95f9f80c9063538dc335 h: refs/heads/master i: 84725: 577772dcc159420622bbdb1cc622282739ebbc35 84723: b3e6d594cf9d03e85b5d4640faaaec8a28524d89 84719: df65d1d2f11adcde0de085d25dd4d0b3fa791a74 v: v3 --- [refs] | 2 +- trunk/fs/libfs.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 61113d0f6544..e6a141c96e83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b88b0998e35d239e74446cc30f354bdab86df89 +refs/heads/master: 9261303ab7589cda6a3b95f9f80c9063538dc335 diff --git a/trunk/fs/libfs.c b/trunk/fs/libfs.c index 2319415ddb5e..d6de56a6e183 100644 --- a/trunk/fs/libfs.c +++ b/trunk/fs/libfs.c @@ -634,7 +634,10 @@ ssize_t simple_attr_read(struct file *file, char __user *buf, if (!attr->get) return -EACCES; - mutex_lock(&attr->mutex); + ret = mutex_lock_interruptible(&attr->mutex); + if (ret) + return ret; + if (*ppos) { /* continued read */ size = strlen(attr->get_buf); } else { /* first read */ @@ -666,7 +669,10 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf, if (!attr->set) return -EACCES; - mutex_lock(&attr->mutex); + ret = mutex_lock_interruptible(&attr->mutex); + if (ret) + return ret; + ret = -EFAULT; size = min(sizeof(attr->set_buf) - 1, len); if (copy_from_user(attr->set_buf, buf, size))