From 8ea49532876588d72212c6d9fec001002be8dde7 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Mon, 4 Jan 2010 22:04:01 +0100 Subject: [PATCH] --- yaml --- r: 178907 b: refs/heads/master c: 5fe1533fda8ae005541bd418a7a8bc4fa0cda522 h: refs/heads/master i: 178905: 3d6bc57bf8e1d026008321241983286cd6412def 178903: 31be217b6958e4eb6324f28d1284af1c4ef26e8d v: v3 --- [refs] | 2 +- trunk/fs/reiserfs/inode.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bbe0d94e6324..257691efaedf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3e22f48f37c1e14441c9f72ca8e63b1d4516745 +refs/heads/master: 5fe1533fda8ae005541bd418a7a8bc4fa0cda522 diff --git a/trunk/fs/reiserfs/inode.c b/trunk/fs/reiserfs/inode.c index bd615dfe4ec7..47dbfb18877a 100644 --- a/trunk/fs/reiserfs/inode.c +++ b/trunk/fs/reiserfs/inode.c @@ -3052,13 +3052,14 @@ static ssize_t reiserfs_direct_IO(int rw, struct kiocb *iocb, int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) { struct inode *inode = dentry->d_inode; - int error; unsigned int ia_valid; + int depth; + int error; /* must be turned off for recursive notify_change calls */ ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID); - reiserfs_write_lock(inode->i_sb); + depth = reiserfs_write_lock_once(inode->i_sb); if (attr->ia_valid & ATTR_SIZE) { /* version 2 items will be caught by the s_maxbytes check ** done for us in vmtruncate @@ -3149,7 +3150,8 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) } out: - reiserfs_write_unlock(inode->i_sb); + reiserfs_write_unlock_once(inode->i_sb, depth); + return error; }