Branch HEAD

b=13568
i=shadow
i=johann

Remove lock_24kernel from lustre/lvfs/fsfilt_ext3.c.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 02b5ecb..afca675 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -39,6 +39,7 @@ Details    : Remove 2.5.0 check from quota_check.c, quota_ctl.c,
             Remove 2.4 kernel code from lustre/mdc/mdc_request.c.
             Remove 2.4 kernel check from lustre/lov/lproc_lov.c.
             Remove 2.4 kernel check from lustre/lmv/lproc_lmv.c.
+            Remove lock_24kernel from lustre/lvfs/fsfilt_ext3.c.
 
 Severity   : enhancement
 Bugzilla   : 13690

diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index de31a79..ce5532b 100644 (file)
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -485,8 +485,6 @@ static int fsfilt_ext3_setattr(struct dentry *dentry, void *handle,
         struct inode *inode = dentry->d_inode;
         int rc = 0;
 
-        lock_24kernel();
-
         /* Avoid marking the inode dirty on the superblock list unnecessarily.
          * We are already writing the inode to disk as part of this
          * transaction and want to avoid a lot of extra inode writeout
@@ -537,7 +535,6 @@ static int fsfilt_ext3_setattr(struct dentry *dentry, void *handle,
         }
 
  out:
-        unlock_24kernel();
         RETURN(rc);
 }